From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 5 Jun 2014 14:41:22 +0000 (+0200)
Subject: certtool: ensure that allocated buffer has a minimum size of 64kb.
X-Git-Tag: gnutls_3_3_5~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54ec96dbfe6b7a294da43fee6e6fda73d524c140;p=thirdparty%2Fgnutls.git

certtool: ensure that allocated buffer has a minimum size of 64kb.
---

diff --git a/src/certtool-common.c b/src/certtool-common.c
index 4f4c395473..3b019f8632 100644
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -41,6 +41,7 @@
 #include "certtool-common.h"
 #include "certtool-args.h"
 #include "certtool-cfg.h"
+#include <minmax.h>
 
 /* Gnulib portability files. */
 #include <read-file.h>
@@ -54,7 +55,7 @@ void fix_lbuffer(unsigned size)
 		if (size == 0)
 			lbuffer_size = 64*1024;
 		else
-			lbuffer_size = size;
+			lbuffer_size = MAX(64*1024,size);
 		lbuffer = malloc(lbuffer_size);
 		if (lbuffer == NULL) {
 			fprintf(stderr, "memory error");