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

Fixed one more buffer underflow

Browse Source
This commit is contained in:
ritt 2022-02-16 15:56:43 +01:00
parent 341dfa2f89
commit 6864323b70
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/elogd.cxx
View File

@ -4555,9 +4555,9 @@ int el_retrieve(LOGBOOK *lbs, int message_id, char *date, char attr_list[MAX_N_A
strlcpy(text, p, *textsize); strlcpy(text, p, *textsize);
/* strip CR at end */ /* strip CR at end */
if (text[strlen(text) - 1] == '\n') { if (strlen(text) > 0 && text[strlen(text) - 1] == '\n') {
text[strlen(text) - 1] = 0; text[strlen(text) - 1] = 0;
if (text[strlen(text) - 1] == '\r') if (strlen(text) > 0 && text[strlen(text) - 1] == '\r')
text[strlen(text) - 1] = 0; text[strlen(text) - 1] = 0;
} }
@ -28732,9 +28732,9 @@ void decode_post(char *logbook, LOGBOOK *lbs, char *string, const char *boundary
if (strstr(_mtext, boundary)) if (strstr(_mtext, boundary))
*strstr(_mtext, boundary) = 0; *strstr(_mtext, boundary) = 0;
ptmp = _mtext + (strlen(_mtext) - 1); ptmp = _mtext + (strlen(_mtext) - 1);
while (*ptmp == '-') while (ptmp >= _mtext && *ptmp == '-' )
*ptmp-- = 0; *ptmp-- = 0;
while (*ptmp == '\n' || *ptmp == '\r') while (ptmp >= _mtext && (*ptmp == '\n' || *ptmp == '\r'))
*ptmp-- = 0; *ptmp-- = 0;
} else { } else {
strlcpy(str, p, sizeof(str)); strlcpy(str, p, sizeof(str));