[Title] fix prevent defect on lib/libcommon/safestring.c

[Desc.] add null check
[Issue] Prevent CID 33895~8

diff --git a/lib/libcommon/safestring.c b/lib/libcommon/safestring.c
index 21918d9..212ef7f 100644 (file)
--- a/lib/libcommon/safestring.c
+++ b/lib/libcommon/safestring.c
@@ -92,12 +92,15 @@ gsize s_strcmp(const char *dst, const char *src)
        srcsize = strlen(src);
        dstsize = strlen(dst);
 
+       if (!dst || !src) {
+               return -1;
+       }
+
        if ((srcsize == 0) && (dstsize == 0)) {
                return 0;
        }
 
-       if (!dst || !src || srcsize == 0 || dstsize == 0)
-       {
+       if (srcsize == 0 || dstsize == 0) {
                return -1;
        }
 
@@ -126,17 +129,23 @@ gsize s_strncmp(const char *dst, const char *src, int n)
        srcsize = strlen(src);
        dstsize = strlen(dst);
 
-       if ((srcsize == 0) && (dstsize == 0))
+       if (!dst || !src) {
+               return -1;
+       }
+
+       if ((srcsize == 0) && (dstsize == 0)) {
                return 0;
+       }
 
-       if (!dst || !src || srcsize == 0 || dstsize == 0 || n == 0) {
+       if (srcsize == 0 || dstsize == 0 || n == 0) {
                log_msg (MSGL_WARN, "Cannot compare the string. Null args or size zero.\n");
                return -1;
        }
 
-       if (srcsize==dstsize)
+       if (srcsize==dstsize) {
                return (strncmp(src, dst, n));
-
-       else
+       }
+       else {
                return -1;
+       }
 }

diff --git a/packaging/vmodemd-emul.spec b/packaging/vmodemd-emul.spec
index 343b576..eed4be5 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.25
+Version: 0.2.26
 Release: 1
 Summary: Modem Emulator
 Group: System/ModemEmulator