aboutsummaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>2012-06-21 17:15:38 -0600
committerJeff Law <law@redhat.com>2012-06-21 17:15:38 -0600
commit006dd86111c44572dbd3b26e9c63dd0f834d7762 (patch)
tree4e7d26946f302574935cd95061a291b859563c19 /intl
parentb7abb4bf78443f4f8d05a9dfa768fdee65b99d42 (diff)
downloadglibc-006dd86111c44572dbd3b26e9c63dd0f834d7762.tar
glibc-006dd86111c44572dbd3b26e9c63dd0f834d7762.tar.gz
glibc-006dd86111c44572dbd3b26e9c63dd0f834d7762.tar.bz2
glibc-006dd86111c44572dbd3b26e9c63dd0f834d7762.zip
[BZ #14277]
* intl/dcigettext.c (_nl_find_msg): Avoid use after potential free. Simplify list management for _LIBC case.
Diffstat (limited to 'intl')
-rw-r--r--intl/dcigettext.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index f6b757379c..fcd1c785cd 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -1155,7 +1155,7 @@ _nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp)
freemem_size);
# ifdef _LIBC
if (newmem != NULL)
- transmem_list = transmem_list->next;
+ transmem_list = newmem;
else
{
struct transmem_list *old = transmem_list;
@@ -1170,6 +1170,12 @@ _nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp)
malloc_count = 1;
freemem_size = INITIAL_BLOCK_SIZE;
newmem = (transmem_block_t *) malloc (freemem_size);
+# ifdef _LIBC
+ /* Add the block to the list of blocks we have to free
+ at some point. */
+ newmem->next = transmem_list;
+ transmem_list = newmem;
+# endif
}
if (__builtin_expect (newmem == NULL, 0))
{
@@ -1180,11 +1186,6 @@ _nl_find_msg (domain_file, domainbinding, msgid, convert, lengthp)
}
# ifdef _LIBC
- /* Add the block to the list of blocks we have to free
- at some point. */
- newmem->next = transmem_list;
- transmem_list = newmem;
-
freemem = (unsigned char *) newmem->data;
freemem_size -= offsetof (struct transmem_list, data);
# else