From 1d0b305370c0635f210984006b54d4278d19ed3f Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Tue, 31 Jan 2017 11:33:17 +0100 Subject: [PATCH] Fixed crash with certain set of parameters and no password file is present --- src/elogd.c | 14 ++++++++------ xcode/elogd.xcodeproj/project.pbxproj | 4 +++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 31ec0694..6e64eb98 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -8804,12 +8804,14 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_ } /* add logbook */ - strcpy(list[i], "logbook"); - strlcpy(value[i++], lbs->name, NAME_LENGTH); - - /* add logbook */ - strcpy(list[i], "elogbook"); - strlcpy(value[i++], lbs->name_enc, NAME_LENGTH); + if (lbs) { + strcpy(list[i], "logbook"); + strlcpy(value[i++], lbs->name, NAME_LENGTH); + + /* add logbook */ + strcpy(list[i], "elogbook"); + strlcpy(value[i++], lbs->name_enc, NAME_LENGTH); + } /* add date */ strcpy(list[i], "date"); diff --git a/xcode/elogd.xcodeproj/project.pbxproj b/xcode/elogd.xcodeproj/project.pbxproj index 8af750ce..ff8bb548 100644 --- a/xcode/elogd.xcodeproj/project.pbxproj +++ b/xcode/elogd.xcodeproj/project.pbxproj @@ -278,11 +278,12 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - HAVE_SSL1, + HAVE_SSL, HAVE_KRB5, DEBUG, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + HEADER_SEARCH_PATHS = /opt/local/include; OTHER_LDFLAGS = ( "-lssl", "-lkrb5", @@ -300,6 +301,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + HEADER_SEARCH_PATHS = /opt/local/include; OTHER_LDFLAGS = ( "-lssl", "-lkrb5",