Apply SVACE rule (2 checkers)

- DEREF_OF_NULL.RET.PROC.STAT
- HANDLE_LEAK

Change-Id: I9d866e0539628c596c9fbd88b2ce711ded0009ea

diff --git a/packaging/libmtp.spec b/packaging/libmtp.spec
index 1c6cf3c..85ee85f 100755 (executable)
--- a/packaging/libmtp.spec
+++ b/packaging/libmtp.spec
@@ -3,7 +3,7 @@
 Name:       libmtp
 Summary:    Library for media transfer protocol (mtp)
 Version:    1.1.9
-Release:    8
+Release:    9
 Group:      Network & Connectivity/Other
 License:    LGPL-2.1
 Source0:    libmtp-%{version}.tar.gz

diff --git a/src/libmtp.c b/src/libmtp.c
index c47feff..25b149b 100755 (executable)
--- a/src/libmtp.c
+++ b/src/libmtp.c
@@ -5514,6 +5514,8 @@ static char *generate_unique_filename(PTPParams* params, char const * const file
   if (check_filename_exists(params, filename))
   {
     extension_position = strrchr(filename,'.');
+    if (extension_position == NULL)
+               return NULL;
 
     char basename[extension_position - filename + 1];
     strncpy(basename, filename, extension_position - filename);

diff --git a/util/mtp-probe.c b/util/mtp-probe.c
index 600e6cd..e3ae3b7 100755 (executable)
--- a/util/mtp-probe.c
+++ b/util/mtp-probe.c
@@ -249,8 +249,10 @@ static int check_sysfs(char *sysfspath)
 
   /* Check for dirs that identify interfaces */
   ret = regcomp(&r, "^[0-9]+-[0-9]+(.[0-9])?\\:[0-9]+\\.[0-9]+$", REG_EXTENDED | REG_NOSUB);
-  if (ret)
+  if (ret) {
+    closedir(dir);
     return -1;
+  }
 
   while ((dent = readdir(dir))) {
     struct stat st;