mirror of
https://github.com/postgres/postgres.git
synced 2025-06-25 01:02:05 +03:00
Replace a bunch more uses of strncpy() with safer coding.
strncpy() has a well-deserved reputation for being unsafe, so make an effort to get rid of nearly all occurrences in HEAD. A large fraction of the remaining uses were passing length less than or equal to the known strlen() of the source, in which case no null-padding can occur and the behavior is equivalent to memcpy(), though doubtless slower and certainly harder to reason about. So just use memcpy() in these cases. In other cases, use either StrNCpy() or strlcpy() as appropriate (depending on whether padding to the full length of the destination buffer seems useful). I left a few strncpy() calls alone in the src/timezone/ code, to keep it in sync with upstream (the IANA tzcode distribution). There are also a few such calls in ecpg that could possibly do with more analysis. AFAICT, none of these changes are more than cosmetic, except for the four occurrences in fe-secure-openssl.c, which are in fact buggy: an overlength source leads to a non-null-terminated destination buffer and ensuing misbehavior. These don't seem like security issues, first because no stack clobber is possible and second because if your values of sslcert etc are coming from untrusted sources then you've got problems way worse than this. Still, it's undesirable to have unpredictable behavior for overlength inputs, so back-patch those four changes to all active branches.
This commit is contained in:
@ -247,7 +247,7 @@ NewMetaString(char *init_str)
|
||||
META_MALLOC(s->str, s->bufsize, char);
|
||||
assert(s->str != NULL);
|
||||
|
||||
strncpy(s->str, init_str, s->length + 1);
|
||||
memcpy(s->str, init_str, s->length + 1);
|
||||
s->free_string_on_destroy = 1;
|
||||
|
||||
return s;
|
||||
|
@ -825,18 +825,18 @@ string2ean(const char *str, bool errorOK, ean13 *result,
|
||||
goto eanwrongtype;
|
||||
break;
|
||||
case ISMN:
|
||||
strncpy(buf, "9790", 4); /* this isn't for sure yet, for now
|
||||
memcpy(buf, "9790", 4); /* this isn't for sure yet, for now
|
||||
* ISMN it's only 9790 */
|
||||
valid = (valid && ((rcheck = checkdig(buf, 13)) == check || magic));
|
||||
break;
|
||||
case ISBN:
|
||||
strncpy(buf, "978", 3);
|
||||
memcpy(buf, "978", 3);
|
||||
valid = (valid && ((rcheck = weight_checkdig(buf + 3, 10)) == check || magic));
|
||||
break;
|
||||
case ISSN:
|
||||
strncpy(buf + 10, "00", 2); /* append 00 as the normal issue
|
||||
memcpy(buf + 10, "00", 2); /* append 00 as the normal issue
|
||||
* publication code */
|
||||
strncpy(buf, "977", 3);
|
||||
memcpy(buf, "977", 3);
|
||||
valid = (valid && ((rcheck = weight_checkdig(buf + 3, 8)) == check || magic));
|
||||
break;
|
||||
case UPC:
|
||||
|
@ -877,7 +877,7 @@ convertPgWchar(pg_wchar c, trgm_mb_char *result)
|
||||
#endif
|
||||
|
||||
/* Fill result with exactly MAX_MULTIBYTE_CHAR_LEN bytes */
|
||||
strncpy(result->bytes, s, MAX_MULTIBYTE_CHAR_LEN);
|
||||
memcpy(result->bytes, s, MAX_MULTIBYTE_CHAR_LEN);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -829,7 +829,7 @@ replaceVariable(char **sql, char *param, int len, char *value)
|
||||
|
||||
if (valueln != len)
|
||||
memmove(param + valueln, param + len, strlen(param + len) + 1);
|
||||
strncpy(param, value, valueln);
|
||||
memcpy(param, value, valueln);
|
||||
|
||||
return param + valueln;
|
||||
}
|
||||
|
@ -708,7 +708,7 @@ px_crypt_des(const char *key, const char *setting)
|
||||
if (des_setkey((char *) keybuf))
|
||||
return (NULL);
|
||||
}
|
||||
strncpy(output, setting, 9);
|
||||
StrNCpy(output, setting, 10);
|
||||
|
||||
/*
|
||||
* Double check that we weren't given a short setting. If we were, the
|
||||
@ -716,7 +716,6 @@ px_crypt_des(const char *key, const char *setting)
|
||||
* salt, but we don't really care. Just make sure the output string
|
||||
* doesn't have an extra NUL in it.
|
||||
*/
|
||||
output[9] = '\0';
|
||||
p = output + strlen(output);
|
||||
}
|
||||
else
|
||||
|
@ -327,7 +327,7 @@ xpath_string(PG_FUNCTION_ARGS)
|
||||
/* We could try casting to string using the libxml function? */
|
||||
|
||||
xpath = (xmlChar *) palloc(pathsize + 9);
|
||||
strncpy((char *) xpath, "string(", 7);
|
||||
memcpy((char *) xpath, "string(", 7);
|
||||
memcpy((char *) (xpath + 7), VARDATA(xpathsupp), pathsize);
|
||||
xpath[pathsize + 7] = ')';
|
||||
xpath[pathsize + 8] = '\0';
|
||||
|
Reference in New Issue
Block a user