[SCM] GNU libidn branch, master, updated. libidn-1-27-4-g36cde6c

[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=36cde6c2fad69a951e0ffa1be53d9ec2e26ef910

The branch, master has been updated
       via  36cde6c2fad69a951e0ffa1be53d9ec2e26ef910 (commit)
       via  fe9fddd4f5e489c15cc7235a6cba5ac5c72fa6e6 (commit)
       via  73dc40d79dfc962ad6d751bf0c980c64fe76f8b6 (commit)
       via  d3dc93579b265c28bd90c481e957c267f5c69de4 (commit)
      from  644cadc45ef7ce6613b9d171cb8b9d5213b1a268 (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 36cde6c2fad69a951e0ffa1be53d9ec2e26ef910
Author: Simon Josefsson <address@hidden>
Date:   Wed Jun 5 22:59:51 2013 +0200

    Prevent tool from crashing when stringprep_utf8_to_locale doesn't work.
    
    Reported by Jeffrey Frey <address@hidden>.

commit fe9fddd4f5e489c15cc7235a6cba5ac5c72fa6e6
Author: Simon Josefsson <address@hidden>
Date:   Wed Jun 5 22:37:14 2013 +0200

    Update for 1.26.

commit 73dc40d79dfc962ad6d751bf0c980c64fe76f8b6
Author: Simon Josefsson <address@hidden>
Date:   Wed Jun 5 22:33:48 2013 +0200

    Bump versions.

commit d3dc93579b265c28bd90c481e957c267f5c69de4
Author: Simon Josefsson <address@hidden>
Date:   Wed Jun 5 22:33:13 2013 +0200

    Ignore more.

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

Summary of changes:
 .gitignore       |    1 +
 NEWS             |    7 +++++++
 THANKS           |    1 +
 configure.ac     |    4 ++--
 doc/announce.txt |   49 ++++++++++++++++++++++++++-----------------------
 src/idn.c        |    2 +-
 6 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04fb630..df80f7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -552,5 +552,6 @@ tests/tst_toutf8
 tests/tst_toutf8.o
 tests/utils.o
 windows/libidn-*-win??.zip
+windows/libidn-*-win??.zip.sig
 windows/tmp32
 windows/tmp64
diff --git a/NEWS b/NEWS
index b85359a..2101b03 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ Libidn NEWS -- History of user-visible changes.                
 -*- outline -*-
 Copyright (C) 2002-2013 Simon Josefsson
 See the end for copying conditions.
 
+* Version 1.28 (unreleased) [stable]
+
+** idn: Don't crash when string conversion from UTF-8 to locale fails.
+Reported by Jeffrey Frey <address@hidden>.
+
+** API and ABI is backwards compatible with the previous version.
+
 * Version 1.27 (released 2013-06-05) [stable]
 
 ** Java library can be built using Maven.  Speed improvements.
diff --git a/THANKS b/THANKS
index baef92f..c51d633 100644
--- a/THANKS
+++ b/THANKS
@@ -104,6 +104,7 @@ René Berber <address@hidden>
 Jon Nelson <address@hidden>
 Bartosz Brachaczek <address@hidden>
 Sarat Chandra Addepalli <address@hidden>
+Jeffrey Frey <address@hidden>
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/configure.ac b/configure.ac
index 8046710..b253c85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public 
License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GNU Libidn], [1.27], address@hidden)
+AC_INIT([GNU Libidn], [1.28], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
@@ -30,7 +30,7 @@ AM_SILENT_RULES([yes])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 17)
-AC_SUBST(LT_REVISION, 10)
+AC_SUBST(LT_REVISION, 11)
 AC_SUBST(LT_AGE, 6)
 
 AC_PROG_CC
diff --git a/doc/announce.txt b/doc/announce.txt
index 62b04f7..790fcac 100644
--- a/doc/announce.txt
+++ b/doc/announce.txt
@@ -1,5 +1,5 @@
 To: address@hidden, address@hidden
-Subject: Libidn 1.25 released
+Subject: Libidn 1.26 released
 <#part sign=pgpmime>
 GNU Libidn is a fully documented implementation of the Stringprep,
 Punycode and IDNA specifications.  Libidn's purpose is to encode and
@@ -8,17 +8,20 @@ and Java libraries.
 
 Noteworthy changes since the last release (from NEWS file):
 
-* Version 1.25 (released 2012-05-23) [stable]
+* Version 1.26 (released 2012-12-11) [stable]
 
-** MSVC: Build fixes related to _GL_ATTRIBUTE_CONST and _GL_ATTRIBUTE_PURE.
-Reported by Bartosz Brachaczek <address@hidden>.
+** libidn, idna_to_ascii: Propagate error on malloc failure.
+Reported by Sarat Chandra Addepalli <address@hidden>.
 
-** examples: Fix compiler warning about ignoring return value from fgets.
+** libidn, tld_get_4: Fix out of bounds read access violation.
 
-** tests: Ship with a valgrind suppressions file for the strlen issue.
-See tests/libidn.supp and  bottom of HACKING for discussion.
+** i18n: Added Croatian translation.  Updated Vietnamese translation.
+Thanks to Tomislav Krznar and Trần Ngọc Quân.
 
-** Update gnulib files and translations.
+** java: Permit usage by Apache projects.
+Thanks to Oliver Hitz and Angus Turner.
+
+** tests: Improve tld self-tests.
 
 ** API and ABI is backwards compatible with the previous version.
 
@@ -90,34 +93,34 @@ If you need help to use Libidn, or want to help others, you 
are
 invited to join our help-libidn mailing list, see:
   https://lists.gnu.org/mailman/listinfo/help-libidn
 
-Here are the compressed sources (3.2MB):
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz
-  http://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz
+Here are the compressed sources (3.3MB):
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.26.tar.gz
+  http://ftp.gnu.org/gnu/libidn/libidn-1.26.tar.gz
 
 Here are GPG detached signatures:
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz.sig
-  http://ftp.gnu.org/gnu/libidn/libidn-1.25.tar.gz.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.26.tar.gz.sig
+  http://ftp.gnu.org/gnu/libidn/libidn-1.26.tar.gz.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-92e64fd5a6428bda6ade2c3cde475b76455cd7dd  libidn-1.25.tar.gz
-99c62bb5fe91b3d04b6c8b1a1971c02ed9b383375f85644ad510e315  libidn-1.25.tar.gz
+b1cb40646a96dadbfc41d060d23dfb382eec1128  libidn-1.26.tar.gz
+415440efbe97f87e1a0f33fd42bec25a8197922c9d1d8e3c20585b17  libidn-1.26.tar.gz
 
 We also provide Windows binaries built using MinGW-w64 with the build
 script windows/libidn4win.mk, for 32-bit and 64-bit x86 architecures:
 
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win32.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win32.zip.sig
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win64.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.25-win64.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.26-win32.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.26-win32.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.26-win64.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.26-win64.zip.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-c2a736922059891ee8f99de9298b9cecda395a0b  libidn-1.25-win32.zip
-10f61aff34f2fbe6c04b142def549cce4636db4e9df261397fc27f13  libidn-1.25-win32.zip
+aca7f2f7bb8832cfbef96dd5af4e293bd3c475c9  libidn-1.26-win32.zip
+fd8d06defc9de9b549ad6c39e14d906bd8cc490ce110421f8b0dfc64  libidn-1.26-win32.zip
 
-a0201ce2305ac9e38d9849dab6eac075d5eaaca1  libidn-1.25-win64.zip
-520d8e841c6f378422b2c667d4fdbf856d16b50b1b750522f74b44d3  libidn-1.25-win64.zip
+c883f0dae9cb4cea658615f2e411c554435312f4  libidn-1.26-win64.zip
+ad83ecb5b32f6fb1bd664378db09d94390ec2df0285f98860ed8aeac  libidn-1.26-win64.zip
 
 The software is cryptographically signed by the author using an OpenPGP
 key identified by the following information:
diff --git a/src/idn.c b/src/idn.c
index 89d6da1..bdb9b02 100644
--- a/src/idn.c
+++ b/src/idn.c
@@ -499,7 +499,7 @@ main (int argc, char *argv[])
 
          p = stringprep_utf8_to_locale (r);
          free (r);
-         if (!r)
+         if (!p)
            error (EXIT_FAILURE, 0, _("could not convert from UTF-8 to %s"),
                   stringprep_locale_charset ());
 


hooks/post-receive
-- 
GNU libidn