CVS commit: [netbsd-6] src/crypto/external/bsd/openssl/dist/crypto/buffer

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Mon May  7 02:57:22 UTC 2012

Modified Files:
        src/crypto/external/bsd/openssl/dist/crypto/buffer [netbsd-6]: buffer.c

Log Message:
Pull up following revision(s) (requested by drochner in ticket #203):
        crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c: revision 1.3
fix for previous fix: correct error code (upstream rev.22474)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.4.1 -r1.1.1.2.4.2 \
    src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c:1.1.1.2.4.1 src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c:1.1.1.2.4.2
--- src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c:1.1.1.2.4.1	Mon Apr 23 16:54:03 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c	Mon May  7 02:57:22 2012
@@ -156,7 +156,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, siz
 	/* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
 	if (len > LIMIT_BEFORE_EXPANSION)
 		{
-		BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+		BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
 		return 0;
 		}
 	n=(len+3)/3*4;