[Title] modify length values' range.

[Desc.] to be under MAX length.

diff --git a/libvmodem/libvgsm_init.c b/libvmodem/libvgsm_init.c
index 29b7891..d26f9c9 100644 (file)
--- a/libvmodem/libvgsm_init.c
+++ b/libvmodem/libvgsm_init.c
@@ -53,7 +53,8 @@ static void get_domain_socket_name(char* result)
 {
     strcpy(result, DEF_DOMAIN_SOCKET_NAME);
     strcat(result, (const char*)"-");
-    strcat(result, getenv("USER"));
+    if((strlen(result) + strlen(getenv("USER"))) < 64)
+       strcat(result, getenv("USER"));
 
 #ifndef _NO_ESPRESSO_DEBUG_
     LIBVGSM_DEBUG("[VGSM] SOCKET NAME [%s]\n", result);

diff --git a/packaging/vmodemd-emul.spec b/packaging/vmodemd-emul.spec
index 61fc1b7..a90ddc0 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.38
+Version: 0.2.39
 Release: 1
 Summary: Modem Emulator
 Group: System/ModemEmulator

diff --git a/vmodem/server/misc.c b/vmodem/server/misc.c
index e6f7544..f740acb 100644 (file)
--- a/vmodem/server/misc.c
+++ b/vmodem/server/misc.c
@@ -160,7 +160,7 @@ int packed_S32(unsigned char* bytearray)
     if (!p) return 0;
 
     for(i = sizeof(int); i >= 0; i--) {
-           if(p[i] < 0 || p[i] > 255){
+           if(p[i] > 255){
                    return 0;
            }
            else{

diff --git a/vmodem/server/server_tx_call.c b/vmodem/server/server_tx_call.c
index fde4a55..c818c62 100644 (file)
--- a/vmodem/server/server_tx_call.c
+++ b/vmodem/server/server_tx_call.c
@@ -412,7 +412,7 @@ int server_tx_call_incoming_noti( LXT_MESSAGE * packet ) //
        else
        {
                tmp = (int)p[3];
-               if(tmp < 0 || tmp > 254){
+               if(tmp < 0 || tmp > MAX_GSM_DIALED_DIGITS_NUMBER){
                        TRACE(MSGL_VGSM_INFO, "ERROR!! Invalid value of packet.data.\n");
                        return -1;
                }