[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_19-5-gace8a66

[Nikos Mavrogiannopoulos]

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 gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=ace8a662ff90679c575658e787f48577e2fd5940

The branch, gnutls_3_0_x-2 has been updated
       via  ace8a662ff90679c575658e787f48577e2fd5940 (commit)
       via  f9b186468e613a2959feaa923fc98adf6f11630b (commit)
      from  f872fab06e7298d1915b175b0fb75f2e2c5a6e17 (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 ace8a662ff90679c575658e787f48577e2fd5940
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed May 9 08:17:18 2012 +0200

    This patch fixes following kind of issue with automake 1.12
    
    | automake: warnings are treated as errors
    | /.../automake-1.12/am/ltlibrary.am: warning: 'libgnutls.la': linking 
libtool libraries using a non-POSIX
    | /.../automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 
'configure.ac'
    
    Patch by: Nitin A Kamble <address@hidden>

commit f9b186468e613a2959feaa923fc98adf6f11630b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue May 8 21:31:31 2012 +0200

    Corrected allocation check

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

Summary of changes:
 configure.ac     |    5 +++++
 lib/gnutls_sig.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0ad765c..ee37707 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,11 @@ AC_MSG_RESULT([***
 dnl Checks for programs.
 AC_PROG_CC
 AM_PROG_AS
+
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
 AC_PROG_CXX
 gl_EARLY
 
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index afed87f..051fe85 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -933,7 +933,7 @@ encode_ber_digest_info (gnutls_digest_algorithm_t hash,
   asn1_der_coding (dinfo, "", NULL, &tmp_output_size, NULL);
 
   tmp_output = gnutls_malloc (tmp_output_size);
-  if (output->data == NULL)
+  if (tmp_output == NULL)
     {
       gnutls_assert ();
       asn1_delete_structure (&dinfo);


hooks/post-receive
-- 
GNU gnutls