AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid undefined behaviour in netgroupcache

Browse Source 
Using a buffer after it has been reallocated is undefined behaviour,
so get offsets of the triplets in the old buffer before reallocating
it.
This commit is contained in:
Siddhesh Poyarekar 2014-01-27 11:32:44 +05:30
parent 0c00f062dd
commit af37a8a349
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-01-27 Siddhesh Poyarekar <siddhesh@redhat.com>
* nscd/netgroupcache.c (addgetnetgrentX): Compute offset from
the old buffer before realloc.
2014-01-27 Allan McRae <allan@archlinux.org>
* po/fr.po: Update French translation from translation project.

16
nscd/netgroupcache.c
View File

@ -241,15 +241,21 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
if (buflen - req->key_len - bufused < needed)
{
buflen += MAX (buflen, 2 * needed);
/* Save offset in the old buffer. We don't
bother with the NULL check here since
we'll do that later anyway. */
size_t nhostdiff = nhost - buffer;
size_t nuserdiff = nuser - buffer;
size_t ndomaindiff = ndomain - buffer;
char *newbuf = xrealloc (buffer, buflen);
/* Adjust the pointers in the new
/* Fix up the triplet pointers into the new
buffer. */
nhost = (nhost ? newbuf + (nhost - buffer)
nhost = (nhost ? newbuf + nhostdiff
: NULL);
nuser = (nuser ? newbuf + (nuser - buffer)
nuser = (nuser ? newbuf + nuserdiff
: NULL);
ndomain = (ndomain
? newbuf + (ndomain - buffer)
ndomain = (ndomain ? newbuf + ndomaindiff
: NULL);
buffer = newbuf;
}