commit 42c3ccf36e86972bff3a74c1e74c11311e6a7af0
author Paul Bakker <p.j.bakker@polarssl.org> Mon Aug 19 14:29:31 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Mon Aug 19 14:29:31 2013 +0200
tree ec0851cb6e482c6fb011aebc0daa68e4e9338982
parent 75c1a6f97c9b25b71bcc95b158bc673f6db04400

Fixed potential negative value misinterpretation in load_file()

library/x509parse.c

diff --git a/library/x509parse.c b/library/x509parse.c
index 535b180..0a3b6fe 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1917,14 +1917,21 @@
 static 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 );
 
+    *n = (size_t) size;
+
     if( *n + 1 == 0 ||
         ( *buf = (unsigned char *) polarssl_malloc( *n + 1 ) ) == NULL )
     {