[Title] fix Resource leak, Dereference before null check and Wrong sizeof argument

[Desc.] modify vmodem/db/db_security.c

diff --git a/packaging/vmodemd-emul.spec b/packaging/vmodemd-emul.spec
index 62f8d91e67ac4a27a4eef4f44d8e0687577623d4..619fa35db43f9186bd10caff27c8791922baa350 100644 (file)
--- a/packaging/vmodemd-emul.spec
+++ b/packaging/vmodemd-emul.spec
@@ -1,6 +1,6 @@
 #git:slp/pkgs/v/vmodem-daemon-emulator
 Name: vmodemd-emul
-Version: 0.2.27
+Version: 0.2.28
 Release: 1
 Summary: Modem Emulator
 Group: System/ModemEmulator

diff --git a/vmodem/db/db_security.c b/vmodem/db/db_security.c
index 5e763961c54ebadbf91368a86e1932f8dadb9523..fb8fa8279216b82c76986f1b468aad84b6911395 100644 (file)
--- a/vmodem/db/db_security.c
+++ b/vmodem/db/db_security.c
@@ -1013,8 +1013,10 @@ int db_sim_sec_add(void)
        SIM_DEBUG("\n");
 
        sim_sec = malloc(sizeof(SimSecurity));
+       if(!sim_sec)
+               return -1;
 
-       memset(sim_sec,0,sizeof(sim_sec));
+       memset(sim_sec,0,sizeof(SimSecurity));
 
        memcpy(sim_sec->pin_value,pin,strlen(pin)+1);
        memcpy(sim_sec->pin2_value,pin2,strlen(pin2)+1);
@@ -1086,6 +1088,7 @@ Done:
        // close the database
        if (db) sqlite3_close(db);
 
+       if(sim_sec) free(sim_sec);
        // return status
        return err == SQLITE_OK ? SIM_SUCCESS : err;
 }