commit fe7c24caa6ebe3867031666065673ea9d77d571e
author Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 11 11:37:33 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 11 11:41:41 2013 +0200
tree f39a56128f3139f0d2a0cd62f2bc8b9ea50739cc
parent 433fad261e3f8fe5c3b403b14f983dcdafddaab3

Fixed potential negative value misinterpretation in load_file()
(cherry picked from commit 42c3ccf36e86972bff3a74c1e74c11311e6a7af0)

Conflicts:
	library/x509parse.c

library/x509parse.c

diff --git a/library/x509parse.c b/library/x509parse.c
index 2c65ebb..86a1ab2 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1836,16 +1836,27 @@
 int load_file( const char *path, unsigned char **buf, size_t *n )
 {
     FILE *f;
+    long size;
 
     if( ( f = fopen( path, "rb" ) ) == NULL )
         return( POLARSSL_ERR_X509_FILE_IO_ERROR );
 
     fseek( f, 0, SEEK_END );
-    *n = (size_t) ftell( f );
+    if( ( size = ftell( f ) ) == -1 )
+    {
+        fclose( f );
+        return( POLARSSL_ERR_X509_FILE_IO_ERROR );
+    }
     fseek( f, 0, SEEK_SET );
 
-    if( ( *buf = (unsigned char *) malloc( *n + 1 ) ) == NULL )
+    *n = (size_t) size;
+
+    if( *n + 1 == 0 ||
+        ( *buf = (unsigned char *) malloc( *n + 1 ) ) == NULL )
+    {
+        fclose( f );
         return( POLARSSL_ERR_X509_MALLOC_FAILED );
+    }
 
     if( fread( *buf, 1, *n, f ) != *n )
     {