mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct off-by-one error in strncat() usage.

Browse Source
This commit is contained in:
Tom Lane 2000-04-04 03:00:16 +00:00
parent 7fbf0af22b
commit 3f94bc19d6
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/interfaces/odbc/convert.c
View File

@ -688,9 +688,9 @@ int lobj_fd, retval;
oldstmtlen = strlen(old_statement); oldstmtlen = strlen(old_statement);
for (opos = 0; opos < oldstmtlen; opos++) { for (opos = 0; opos < oldstmtlen; opos++) {
// Squeeze carriage-returns/linfeed pairs to linefeed only // Squeeze carriage-return/linefeed pairs to linefeed only
if (old_statement[opos] == '\r' && opos+1 < oldstmtlen && if (old_statement[opos] == '\r' && opos+1 < oldstmtlen &&
old_statement[opos+1] == '\n') { old_statement[opos+1] == '\n') {
continue; continue;
@ -1156,7 +1156,7 @@ char key[33];
*funcEnd = svchar; *funcEnd = svchar;
while ((*funcEnd != '\0') && isspace(*funcEnd)) funcEnd++; while ((*funcEnd != '\0') && isspace(*funcEnd)) funcEnd++;
/* We expect left parenthensis here, /* We expect left parenthesis here,
* else return fn body as-is since it is * else return fn body as-is since it is
* one of those "function constants". * one of those "function constants".
*/ */
@ -1175,7 +1175,7 @@ char key[33];
} }
/* copy mapped name and remaining input string */ /* copy mapped name and remaining input string */
strcpy(escape, mapFunc); strcpy(escape, mapFunc);
strncat(escape, funcEnd, sizeof(escape)-strlen(mapFunc)); strncat(escape, funcEnd, sizeof(escape)-1-strlen(mapFunc));
} }
else { else {
/* Bogus key, leave untranslated */ /* Bogus key, leave untranslated */