[Libreoffice-commits] core.git: desktop/source

[Norbert Thiebaud]

 desktop/source/lib/shim.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 62be20899d952d54e5ee5874d26ffb20b8f70eef
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon May 13 18:11:22 2013 -0500

    coverity#1000721 Resource Leak
    
    Change-Id: I59161a08eee0406ac71b1212a0a8697edf27911f
    Reviewed-on: https://gerrit.libreoffice.org/3897
    Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>

diff --git a/desktop/source/lib/shim.cxx b/desktop/source/lib/shim.cxx
index 546d0da..8c47dc4 100644
--- a/desktop/source/lib/shim.cxx
+++ b/desktop/source/lib/shim.cxx
@@ -31,7 +31,12 @@ SAL_DLLPUBLIC_EXPORT LibLibreOffice *lo_init( const char *install_path )
 {
     if( !install_path )
         return NULL;
-    char *imp_lib = (char *) malloc( strlen (install_path) + sizeof( TARGET_LIB ) + 2 );
+    char* imp_lib = (char *) malloc( strlen (install_path) + sizeof( TARGET_LIB ) + 2 );
+    if(!imp_lib)
+    {
+        fprintf( stderr, "failed to open library : not enough memory\n");
+        return NULL;
+    }
     strcpy( imp_lib, install_path );
     strcat( imp_lib, "/" );
     strcat( imp_lib, TARGET_LIB );
@@ -39,12 +44,14 @@ SAL_DLLPUBLIC_EXPORT LibLibreOffice *lo_init( const char *install_path )
     if( !dlhandle )
     {
         fprintf( stderr, "failed to open library '%s'\n", imp_lib );
+        free( imp_lib );
         return NULL;
     }
 
     HookFunction *pSym = (HookFunction *) dlsym( dlhandle, "liblibreoffice_hook" );
     if( !pSym ) {
         fprintf( stderr, "failed to find hook in library '%s'\n", imp_lib );
+        free( imp_lib );
         return NULL;
     }