[SCM] GNU libidn branch, master, updated. libidn-1-25-6-geda5912

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=eda5912eb2b2b7b9abfa04b7eba7f8c44ee52f88

The branch, master has been updated
       via  eda5912eb2b2b7b9abfa04b7eba7f8c44ee52f88 (commit)
      from  e9846400044601fb2aa10cde67fefd389d2dbf5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eda5912eb2b2b7b9abfa04b7eba7f8c44ee52f88
Author: Simon Josefsson <address@hidden>
Date:   Thu Aug 2 22:17:42 2012 +0200

    libidn, idna_to_ascii: Propagate error on malloc failure.
    
    Reported and tiny patch by Sarat Chandra Addepalli <address@hidden>.

-----------------------------------------------------------------------

Summary of changes:
 NEWS       |    3 +++
 THANKS     |    1 +
 lib/idna.c |    3 +++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 6551638..535b6c8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 1.26 (unreleased) [stable]
 
+** libidn, idna_to_ascii: Propagate error on malloc failure.
+Reported by Sarat Chandra Addepalli <address@hidden>.
+
 ** API and ABI is backwards compatible with the previous version.
 
 * Version 1.25 (released 2012-05-23) [stable]
diff --git a/THANKS b/THANKS
index e946a45..0b437ea 100644
--- a/THANKS
+++ b/THANKS
@@ -103,6 +103,7 @@ Bittner Ede <address@hidden>
 René Berber <address@hidden>
 Jon Nelson <address@hidden>
 Bartosz Brachaczek <address@hidden>
+Sarat Chandra Addepalli <address@hidden>
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/lib/idna.c b/lib/idna.c
index 9ab413c..87eefb3 100644
--- a/lib/idna.c
+++ b/lib/idna.c
@@ -154,6 +154,9 @@ idna_to_ascii_4i (const uint32_t * in, size_t inlen, char 
*out, int flags)
     src = stringprep_utf8_to_ucs4 (p, -1, NULL);
 
     free (p);
+
+    if (!src)
+      return IDNA_MALLOC_ERROR;
   }
 
 step3:


hooks/post-receive
-- 
GNU libidn