Fixing memory leaks, more than likely responsible for JRUBY-6313

Author: tychobrailleur

argparser.cpp

@@ -5,6 +5,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <memory>
+#include <string>
 #include "utilsfuncs.h"
 #include "argparser.h"
 #include "argnames.h"
@@ -166,12 +167,9 @@ bool ArgParser::initPlatformDir() {
 
     if (!found) {               // try via PATH search
         logMsg("initPlatformDir: trying to find executable on PATH");
-        char * location = findOnPath(platformDir.c_str());
-        if (location != NULL) {
-            strncpy(path, location, PATH_MAX);
-            free(location);
-            found = true;
-        }
+        std::string location = findOnPath(platformDir.c_str());
+        strncpy(path, location.c_str(), PATH_MAX);
+        found = true;
     }
 
     if (!found) {               // try via JRUBY_HOME
@@ -430,6 +428,7 @@ void ArgParser::prepareOptions() {
         option += bootClassPath;
         javaOptions.push_back(option);
     }
+
 }
 
 void ArgParser::setupMaxHeapAndStack() {

unixlauncher.cpp

@@ -28,8 +28,15 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
     if (nailgunClient) {
         progArgs.push_front("org.jruby.util.NailMain");
         char ** nailArgv = convertToArgvArray(progArgs);
+        int nailArgc = progArgs.size();
+
         if (printCommandLine) {
-            return printArgvToConsole(nailArgv);
+            printListToConsole(progArgs);
+            for (int i = 0; i < nailArgc; i++) {
+                free(nailArgv[i]);
+            }
+            delete[] nailArgv;
+            return 0;
         }
         return nailgunClientMain(progArgs.size(), (char**)nailArgv, envp);
     }
@@ -65,12 +72,17 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
     }
 
     char** newArgv = convertToArgvArray(commandLine);
+    int newArgc = commandLine.size();
 
     if (printCommandLine) {
-        return printArgvToConsole(newArgv);
+        printListToConsole(commandLine);
+        for (int i = 0; i < newArgc; i++) {
+            free(newArgv[i]);
+        }
+        delete[] newArgv;
+        return 0;
     }
 
-
     if (!fileExists(java.c_str())) {
         string msg = "No `java' exists at " + java + ", please double-check JAVA_HOME.\n";
         printToConsole(msg.c_str());

utilsfuncs.cpp

@@ -47,6 +47,10 @@
 #include <cstring>
 #include <cstdlib>
 #include <memory>
+#include <list>
+#include <algorithm>
+#include <iterator>
+#include <iostream>
 #include "utilsfuncs.h"
 #include "argnames.h"
 
@@ -114,7 +118,7 @@ bool fileExists(const char *path) {
     return true;
 }
 
-char* findOnPath(const char* name) {
+string findOnPath(const char* name) {
     string path(getenv("PATH"));
     size_t start = 0;
     size_t sep;
@@ -133,9 +137,8 @@ char* findOnPath(const char* name) {
 	elem += name;
 
 	if (checkExists(elem.c_str(), 0)) {
-	    found = (char*) malloc(elem.length());
-	    strncpy(found, elem.c_str(), elem.length() + 1);
-	    return found;
+            string found_string(elem);
+	    return found_string;
 	}
 
 	start = sep + 1;
@@ -244,26 +247,24 @@ bool printToConsole(const char *msg) {
 }
 
 char** convertToArgvArray(list<string> args) {
-    char ** argv = (char**) malloc(sizeof (char*) * args.size() + 1);
+    char ** argv = new char*[args.size()+2];
     int i = 0;
     for (list<string>::iterator it = args.begin(); it != args.end(); ++it, ++i) {
-        argv[i] = (char*) malloc(sizeof(char) * it->length() + 1);
-        strncpy(argv[i], it->c_str(), it->length() + 1);
+        argv[i] = strdup((*it).c_str());
     }
-    argv[i] = NULL;
+    argv[args.size()+1] = NULL;
     return argv;
 }
 
 void addToArgList(list<string> & args, int argc, char ** argv) {
     for (int i = 0; i < argc; i++) {
-	args.push_back(argv[i]);
+        std::string str(argv[i]);
+	args.push_back(str);
     }
 }
 
-int printArgvToConsole(char** argv) {
-    while (*argv) {
-	printf("%s\n", *argv);
-	argv++;
+void printListToConsole(list<string> values) {
+    for (list<string>::iterator it = values.begin(); it != values.end(); ++it) {
+        std::cout << *it << std::endl;
     }
-    return 0;
 }

utilsfuncs.h

@@ -56,9 +56,9 @@ bool checkLoggingArg(int argc, char *argv[], bool delFile);
 bool printToConsole(const char *msg);
 char** convertToArgvArray(std::list<std::string> args);
 void addToArgList(std::list<std::string> & args, int argc, char ** argv);
-char* findOnPath(const char* name);
+std::string findOnPath(const char* name);
 bool checkDirectory(const char* path);
-int printArgvToConsole(char** argv);
+void printListToConsole(std::list<std::string> l);
 
 #ifndef WIN32
 #define FILE_SEP '/'