generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "inet_ntop: pass the size of tmp to snprintf()"

Browse Source
This commit is contained in:
Nick Kralevich 2012-06-11 16:11:20 -07:00 committed by Android (Google) Code Review
commit 0f5b48ce28
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/inet/inet_ntop.c
View File

@ -75,8 +75,13 @@ inet_ntop4(const u_char *src, char *dst, size_t size)
char tmp[sizeof "255.255.255.255"]; char tmp[sizeof "255.255.255.255"];
int l; int l;
#if defined(ANDROID_CHANGES)
l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]);
if (l <= 0 || (size_t)l >= size || (size_t)l >= sizeof(tmp)) {
#else
l = snprintf(tmp, size, fmt, src[0], src[1], src[2], src[3]); l = snprintf(tmp, size, fmt, src[0], src[1], src[2], src[3]);
if (l <= 0 || (size_t)l >= size) { if (l <= 0 || (size_t)l >= size) {
#endif
errno = ENOSPC; errno = ENOSPC;
return (NULL); return (NULL);
} }