[CID 14893] revdb: Fix some incorrect deallocator usage

peter-b · peter-b · commit bad780ca86e7 · 2017-02-08T17:35:18.000Z
Coverity-ID: 14877
Coverity-ID: 14893
Coverity-ID: 15833
diff --git a/revdb/src/unxsupport.cpp b/revdb/src/unxsupport.cpp
@@ -124,13 +124,14 @@ char *MCS_resolvepath(const char *path)
       pw = getpwnam(tpath + 1);
     if (pw == NULL)
       return NULL;
-    tildepath = new (nothrow) char[strlen(pw->pw_dir) + strlen(tptr) + 2];
+    tildepath = static_cast<char*>(malloc(sizeof(*tildepath) *
+                                          (strlen(pw->pw_dir) + strlen(tptr) + 2)));
     strcpy(tildepath, pw->pw_dir);
     if (*tptr) {
       strcat(tildepath, "/");
       strcat(tildepath, tptr);
     }
-    delete tpath;
+    free(tpath);
   }
   else
     tildepath = strclone(path);
@@ -150,11 +151,11 @@ char *MCS_resolvepath(const char *path)
   char *newname = new (nothrow) char[PATH_MAX + 2];
 
   if ((size = readlink(tildepath, newname, PATH_MAX)) < 0) {
-    delete tildepath;
-    delete newname;
+      free(tildepath);
+    delete[] newname;
     return NULL;
   }
-  delete tildepath;
+  free(tildepath);
   newname[size] = '\0';
   if (newname[0] != '/') {
     char *fullpath = new (nothrow) char[strlen(path) + strlen(newname) + 2];
@@ -165,9 +166,9 @@ char *MCS_resolvepath(const char *path)
     else
       sptr++;
     strcpy(sptr, newname);
-    delete newname;
+    delete[] newname;
     newname = MCS_resolvepath(fullpath);
-    delete fullpath;
+    delete[] fullpath;
   }
   return newname;
 }
