From 694d3aeb47872d35e3e652bf6f39117a83f28246 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Mon, 19 Aug 2013 14:23:38 +0200 Subject: [PATCH] Fixed potential heap buffer overflow on large file reading --- library/x509parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/x509parse.c b/library/x509parse.c index a4ee6b548..535b18075 100644 --- a/library/x509parse.c +++ b/library/x509parse.c @@ -1925,7 +1925,8 @@ static int load_file( const char *path, unsigned char **buf, size_t *n ) *n = (size_t) ftell( f ); fseek( f, 0, SEEK_SET ); - if( ( *buf = (unsigned char *) polarssl_malloc( *n + 1 ) ) == NULL ) + if( *n + 1 == 0 || + ( *buf = (unsigned char *) polarssl_malloc( *n + 1 ) ) == NULL ) { fclose( f ); return( POLARSSL_ERR_X509_MALLOC_FAILED );