ELOG/elog
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed overlapping strlcpy(), seems to segfault under some MacOSX

Browse Source
This commit is contained in:
ritt
2019-05-01 10:59:30 +02:00
parent 86bf87baa9
commit 6aa2df9d30
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mxml
+1 -1
Submodule mxml updated: cb34fe499c...15c5f5c676
src/elogd.c
+10 -5
View File
@@ -18709,7 +18709,8 @@ BOOL subst_param(char *str, int size, char *param, char *value)
p1 = s - 1;
for (p2 = p1 + strlen(param_enc) + 1; *p2 && *p2 != '&'; p2++);
strlcpy(p1, p2, size - (p1 - str));
strlcpy(str2, p2, sizeof(str2));
strlcpy(p1, str2, size - (p1 - str));
if (!strchr(str, '?') && strchr(str, '&'))
*strchr(str, '&') = '?';
@@ -19010,15 +19011,19 @@ void build_ref(char *ref, int size, char *mode, char *expand, char *attach, char
strlcat(ref, strchr(getparam("cmdline"), '?'), size);
/* eliminate old search */
if (strstr(ref, "cmd=Search&"))
strlcpy(strstr(ref, "cmd=Search&"), strstr(ref, "cmd=Search&") + 11, sizeof(str));
if (strstr(ref, "cmd=Search&")) {
strlcpy(str, strstr(ref, "cmd=Search&") + 11, sizeof(str));
p = strstr(ref, "cmd=Search&");
strlcpy(p, str, size - (p - ref));
}
/* eliminate id=xxx */
if (strstr(ref, "id=")) {
p = strstr(ref, "id=") + 3;
strlcpy(str, ref, sizeof(str));
p = strstr(str, "id=") + 3;
while (*p && isdigit(*p))
p++;
strlcpy(strstr(ref, "id="), p, sizeof(str));
strlcpy(strstr(ref, "id="), p, size);
if (strlen(ref) > 0 && ref[strlen(ref) - 1] == '?')
ref[strlen(ref) - 1] = 0;
}