Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-29 04:04:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash with certain set of parameters and no password file is present

Browse Source
This commit is contained in:
Stefan Ritt 2017-01-31 11:33:17 +01:00
parent edc5e85a21
commit 1d0b305370
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/elogd.c
View File

@ -8804,12 +8804,14 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
} }
/* add logbook */ /* add logbook */
strcpy(list[i], "logbook"); if (lbs) {
strlcpy(value[i++], lbs->name, NAME_LENGTH); strcpy(list[i], "logbook");
strlcpy(value[i++], lbs->name, NAME_LENGTH);
/* add logbook */
strcpy(list[i], "elogbook"); /* add logbook */
strlcpy(value[i++], lbs->name_enc, NAME_LENGTH); strcpy(list[i], "elogbook");
strlcpy(value[i++], lbs->name_enc, NAME_LENGTH);
}
/* add date */ /* add date */
strcpy(list[i], "date"); strcpy(list[i], "date");

4
xcode/elogd.xcodeproj/project.pbxproj
View File

@ -278,11 +278,12 @@
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
HAVE_SSL1, HAVE_SSL,
HAVE_KRB5, HAVE_KRB5,
DEBUG, DEBUG,
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = /opt/local/include;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lssl", "-lssl",
"-lkrb5", "-lkrb5",
@ -300,6 +301,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = /opt/local/include;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lssl", "-lssl",
"-lkrb5", "-lkrb5",