[Title] add pointer initialization, null check.

[Desc.] vmodem/sat/sat_util.c, vmodem/server/client.c, server_tx_call.c, vmodem/transport/transport_onedram.c

diff --git a/vmodem/sat/sat_util.c b/vmodem/sat/sat_util.c
index f48f200..c6f927b 100644 (file)
--- a/vmodem/sat/sat_util.c
+++ b/vmodem/sat/sat_util.c
@@ -1786,7 +1786,8 @@ int   Set_Up_Call(void *data)
                TRACE(MSGL_VGSM_ERR, "sat_apdu_encode failed with error (0x%08x).", err);
                return err;
        }
-
+       if(!apduStrP)
+               return -1;
        str_size = strlen(apduStrP);
 
 

diff --git a/vmodem/server/client.c b/vmodem/server/client.c
index ef7a604..f7eb2cb 100644 (file)
--- a/vmodem/server/client.c
+++ b/vmodem/server/client.c
@@ -572,7 +572,7 @@ static void do_sim(PhoneServer * ps, TClientInfo * ci, LXT_MESSAGE * packet)
        gsm_sec_status_type status;
        gsm_sec_lock_mode_e_type flag;
 
-       char *password;
+       char *password = NULL;
        PB * pb;
 
        STATE current;

diff --git a/vmodem/server/server_tx_call.c b/vmodem/server/server_tx_call.c
index dd7199d..4930097 100644 (file)
--- a/vmodem/server/server_tx_call.c
+++ b/vmodem/server/server_tx_call.c
@@ -626,11 +626,11 @@ int server_tx_call_release_internal(int call_id)
        if(list){
                packet.data = list;
                packet.length = sizeof(gsm_call_list_t);
-       }
+       }/* Execution cannot reach this statement
        else{
                packet.data = NULL;
                packet.length = 0;
-       }
+       }*/
 
        packet.group  = GSM_CALL;
        packet.action = GSM_CALL_STATUS_NOTI;

diff --git a/vmodem/transport/transport_onedram.c b/vmodem/transport/transport_onedram.c
index a1345df..981b556 100644 (file)
--- a/vmodem/transport/transport_onedram.c
+++ b/vmodem/transport/transport_onedram.c
@@ -110,7 +110,7 @@ int UART_PSI_load (void)
        unsigned char ch;
        int length = 0;
        unsigned int data_len = 0;
-       unsigned char *data_buffer;
+       unsigned char *data_buffer = NULL;
        int i;
        int nCRC = 0;
        int at_num = 0;