kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-30 14:06:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2752 from signalwire/xml

Browse Source 
[xmlrpc-c] Coverity 1500253, 1024634, 1024635, 1227693 fixes.
This commit is contained in:
Andrey Volk 2025-01-30 16:46:58 +03:00 committed by GitHub
commit 73eb85674f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/xmlrpc-c/lib/abyss/src/handler.c
View File

@ -247,7 +247,7 @@ sendDirectoryDocument(TList * const listP,
uint32_t k; uint32_t k;
if (text) { if (text) {
sprintf(z, "Index of %s" CRLF, uri); snprintf(z, sizeof(z), "Index of %s" CRLF, uri);
i = strlen(z)-2; i = strlen(z)-2;
p = z + i + 2; p = z + i + 2;
@ -257,17 +257,17 @@ sendDirectoryDocument(TList * const listP,
} }
*p = '\0'; *p = '\0';
strcat(z, CRLF CRLF strncat(z, CRLF CRLF
"Name Size " "Name Size "
"Date-Time Type" CRLF "Date-Time Type" CRLF
"------------------------------------" "------------------------------------"
"--------------------------------------------"CRLF); "--------------------------------------------"CRLF, sizeof(z) - strlen(z) - 1);
} else { } else {
sprintf(z, "<HTML><HEAD><TITLE>Index of %s</TITLE></HEAD><BODY>" snprintf(z, sizeof(z), "<HTML><HEAD><TITLE>Index of %s</TITLE></HEAD><BODY>"
"<H1>Index of %s</H1><PRE>", "<H1>Index of %s</H1><PRE>",
uri, uri); uri, uri);
strcat(z, "Name Size " strncat(z, "Name Size "
"Date-Time Type<HR WIDTH=100%>"CRLF); "Date-Time Type<HR WIDTH=100%>"CRLF, sizeof(z) - strlen(z) - 1);
} }
HTTPWriteBodyChunk(sessionP, z, strlen(z)); HTTPWriteBodyChunk(sessionP, z, strlen(z));
@ -293,7 +293,7 @@ sendDirectoryDocument(TList * const listP,
else else
--i; --i;
strcpy(z, fi->name); snprintf(z, sizeof(z), "%s", fi->name);
k = strlen(z); k = strlen(z);
@ -303,14 +303,11 @@ sendDirectoryDocument(TList * const listP,
} }
if (k > 24) { if (k > 24) {
z[10] = '\0'; snprintf(z1, sizeof(z1), "%.10s...%s", z, z + k - 11);
strcpy(z1, z);
strcat(z1, "...");
strcat(z1, z + k - 11);
k = 24; k = 24;
p = z1 + 24; p = z1 + 24;
} else { } else {
strcpy(z1, z); snprintf(z1, sizeof(z1), "%s", z);
++k; ++k;
p = z1 + k; p = z1 + k;
@ -321,11 +318,11 @@ sendDirectoryDocument(TList * const listP,
} }
xmlrpc_gmtime(fi->time_write, &ftm); xmlrpc_gmtime(fi->time_write, &ftm);
sprintf(z2, "%02u/%02u/%04u %02u:%02u:%02u",ftm.tm_mday,ftm.tm_mon+1, snprintf(z2, sizeof(z2), "%02u/%02u/%04u %02u:%02u:%02u",ftm.tm_mday,ftm.tm_mon+1,
ftm.tm_year+1900,ftm.tm_hour,ftm.tm_min,ftm.tm_sec); ftm.tm_year+1900,ftm.tm_hour,ftm.tm_min,ftm.tm_sec);
if (fi->attrib & A_SUBDIR) { if (fi->attrib & A_SUBDIR) {
strcpy(z3, " -- "); snprintf(z3, sizeof(z3), " -- ");
z4 = "Directory"; z4 = "Directory";
} else { } else {
if (fi->size < 9999) if (fi->size < 9999)
@ -343,7 +340,7 @@ sendDirectoryDocument(TList * const listP,
} }
} }
sprintf(z3, "%5" PRIu64 " %c", fi->size, u); snprintf(z3, sizeof(z3), "%5" PRIu64 " %c", fi->size, u);
if (xmlrpc_streq(fi->name, "..")) if (xmlrpc_streq(fi->name, ".."))
z4 = ""; z4 = "";
@ -355,9 +352,9 @@ sendDirectoryDocument(TList * const listP,
} }
if (text) if (text)
sprintf(z, "%s%s %s %s %s"CRLF, z1, p, z3, z2, z4); snprintf(z, sizeof(z), "%s%s %s %s %s"CRLF, z1, p, z3, z2, z4);
else else
sprintf(z, "<A HREF=\"%s%s\">%s</A>%s %s %s %s"CRLF, snprintf(z, sizeof(z), "<A HREF=\"%s%s\">%s</A>%s %s %s %s"CRLF,
fi->name, fi->attrib & A_SUBDIR ? "/" : "", fi->name, fi->attrib & A_SUBDIR ? "/" : "",
z1, p, z3, z2, z4); z1, p, z3, z2, z4);
@ -366,9 +363,9 @@ sendDirectoryDocument(TList * const listP,
/* Write the tail of the file */ /* Write the tail of the file */
if (text) if (text)
strcpy(z, SERVER_PLAIN_INFO); snprintf(z, sizeof(z), "%s", SERVER_PLAIN_INFO);
else else
strcpy(z, "</PRE>" SERVER_HTML_INFO "</BODY></HTML>" CRLF CRLF); snprintf(z, sizeof(z), "%s", "</PRE>" SERVER_HTML_INFO "</BODY></HTML>" CRLF CRLF);
HTTPWriteBodyChunk(sessionP, z, strlen(z)); HTTPWriteBodyChunk(sessionP, z, strlen(z));
} }
@ -689,8 +686,7 @@ HandlerDefaultBuiltin(TSession * const sessionP) {
return TRUE; return TRUE;
} }
strcpy(z, handlerP->filesPath); snprintf(z, sizeof(z), "%s%s", handlerP->filesPath, sessionP->requestInfo.uri);
strcat(z, sessionP->requestInfo.uri);
p = z + strlen(z) - 1; p = z + strlen(z) - 1;
if (*p == '/') { if (*p == '/') {
@ -710,7 +706,7 @@ HandlerDefaultBuiltin(TSession * const sessionP) {
** to avoid problems with some browsers (IE for examples) when ** to avoid problems with some browsers (IE for examples) when
** they generate relative urls */ ** they generate relative urls */
if (!endingslash) { if (!endingslash) {
strcpy(z, sessionP->requestInfo.uri); snprintf(z, sizeof(z), "%s", sessionP->requestInfo.uri);
p = z+strlen(z); p = z+strlen(z);
*p = '/'; *p = '/';
*(p+1) = '\0'; *(p+1) = '\0';
@ -727,7 +723,7 @@ HandlerDefaultBuiltin(TSession * const sessionP) {
i = handlerP->defaultFileNames.size; i = handlerP->defaultFileNames.size;
while (i-- > 0) { while (i-- > 0) {
*p = '\0'; *p = '\0';
strcat(z, (handlerP->defaultFileNames.item[i])); strncat(z, handlerP->defaultFileNames.item[i], sizeof(z) - strlen(z) - 1);
if (FileStat(z, &fs)) { if (FileStat(z, &fs)) {
if (!(fs.st_mode & S_IFDIR)) if (!(fs.st_mode & S_IFDIR))
handleFile(sessionP, z, fs.st_mtime, handleFile(sessionP, z, fs.st_mtime,