diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | stdlib/setenv.c | 7 |
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 9ca4f27338..653dfdd389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-01-07 Eric Biggers <ebiggers3@gmail.com> + + [BZ #17658] + * stdlib/setenv.c: Fix memory leak when setting large, + duplicate string. + 2015-01-06 Vladimir A. Nazarenko <naszar@ya.ru> . [BZ #17273] diff --git a/NEWS b/NEWS index 85828857a0..bec70dc04c 100644 --- a/NEWS +++ b/NEWS @@ -14,10 +14,10 @@ Version 2.21 17273, 17344, 17363, 17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583, 17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, - 17630, 17633, 17634, 17635, 17647, 17653, 17657, 17664, 17665, 17668, - 17682, 17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, - 17745, 17746, 17747, 17775, 17777, 17780, 17781, 17782, 17793, 17796, - 17797, 17806 + 17630, 17633, 17634, 17635, 17647, 17653, 17657, 17658, 17664, 17665, + 17668, 17682, 17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733, + 17744, 17745, 17746, 17747, 17775, 17777, 17780, 17781, 17782, 17793, + 17796, 17797, 17806 * i386 memcpy functions optimized with SSE2 unaligned load/store. diff --git a/stdlib/setenv.c b/stdlib/setenv.c index 710da1383c..b60c4f0151 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -217,6 +217,13 @@ __add_to_environ (name, value, combined, replace) /* And remember the value. */ STORE_VALUE (np); } +#ifdef USE_TSEARCH + else + { + if (__glibc_unlikely (! use_alloca)) + free (new_value); + } +#endif } *ep = np; |