[Title] fix prevent defects on libvmodem/libvgsm_call.c, libvgsm_data.c, libvgsm_disp...

[Desc.] Resource leak and null check.
[Issue] Prevent CID 33798~33802, 33899

diff --git a/libvmodem/libvgsm_call.c b/libvmodem/libvgsm_call.c
index 7ea492c..c4e7dc2 100644 (file)
--- a/libvmodem/libvgsm_call.c
+++ b/libvmodem/libvgsm_call.c
@@ -43,11 +43,11 @@ int vgsm_call_make(LXT_HANDLE* handle, gsm_call_info_t callinfo)
 
        length = sizeof(gsm_call_info_t);
        
-       unsigned char * pdata = (unsigned char *) malloc(length);
-
        if( handle == NULL )
                return -1;
 
+       unsigned char * pdata = (unsigned char *) malloc(length);
+
        if (!pdata)
                return (-1);
 

diff --git a/libvmodem/libvgsm_data.c b/libvmodem/libvgsm_data.c
index 909f8c1..179da40 100644 (file)
--- a/libvmodem/libvgsm_data.c
+++ b/libvmodem/libvgsm_data.c
@@ -34,11 +34,11 @@ int vgsm_data_status(LXT_HANDLE* handle, GSM_DataCallStatus status)
        int nretn = 0;
        int     length = 4;
 
-       unsigned char * pdata = (unsigned char *) malloc(length);
-
        if( handle == NULL )
                return -1;
 
+       unsigned char * pdata = (unsigned char *) malloc(length);
+
        if (!pdata)
                return (-1);
 

diff --git a/libvmodem/libvgsm_display.c b/libvmodem/libvgsm_display.c
index 53771c9..b8a46cc 100644 (file)
--- a/libvmodem/libvgsm_display.c
+++ b/libvmodem/libvgsm_display.c
@@ -34,11 +34,11 @@ int vgsm_display_icon_information(LXT_HANDLE* handle, disp_icon_info_t info)
        int nretn = 0;
        int     length = 5; 
 
-       unsigned char * pdata = (unsigned char *) malloc(length);
-
        if( handle == NULL )
                return -1;
 
+       unsigned char * pdata = (unsigned char *) malloc(length);
+
        if (!pdata)
                return (-1);
 

diff --git a/libvmodem/libvgsm_edb.c b/libvmodem/libvgsm_edb.c
index 6e6fd86..788986c 100644 (file)
--- a/libvmodem/libvgsm_edb.c
+++ b/libvmodem/libvgsm_edb.c
@@ -52,16 +52,18 @@
 
 int vgsm_get_pb_edb(LXT_HANDLE * handle)
 {
+       if( handle == NULL )
+               return -1;
+       
        printf("[LIBVGSM-SIM] vgsm_get_pb_edb\n");
 
        _Pb_edb *pb_edb;
        pb_edb = malloc(sizeof(_Pb_edb));
+       if(!pb_edb)
+               return -1;
        memset(pb_edb,0,sizeof(_Pb_edb));
        int ret;
        
-       if( handle == NULL )
-               return -1;
-       
        ret =  lxt_msg_send_message
                (
                        handle->fd,

diff --git a/libvmodem/libvgsm_hdlc.c b/libvmodem/libvgsm_hdlc.c
index 5374657..9470625 100644 (file)
--- a/libvmodem/libvgsm_hdlc.c
+++ b/libvmodem/libvgsm_hdlc.c
@@ -100,13 +100,13 @@ void FreeAllMultiNodeList()
 
 void PushHDLCMultiFrameInfo(HDLCFrame_t const* pframe)
 {
-       TRACE(MSGL_VGSM_INFO, "\n");
-
-       HDLCNode* pnode = malloc(sizeof(HDLCNode));
-
        if (!pframe)
                return;
 
+       TRACE(MSGL_VGSM_INFO, "\n");
+
+       HDLCNode* pnode = malloc(sizeof(HDLCNode));
+       if(!pnode) return;
        memset(pnode, 0, sizeof(HDLCNode));
 
        pnode->m_HDLCNode.m_Length = pframe->m_Length;