Preventing NULL optarg being assigned to std::string

catalogue/CreateAdminHostCmdLineArgs.cpp

@@ -45,13 +45,13 @@ CreateAdminHostCmdLineArgs::CreateAdminHostCmdLineArgs(const int argc, char *con
   while((opt = getopt_long(argc, argv, ":c:hn:", longopts, NULL)) != -1) {
     switch(opt) {
     case 'c':
-      comment = optarg;
+      comment = optarg ? optarg : "";
       break;
     case 'h':
       help = true;
       break;
     case 'n':
-      adminHostname = optarg;
+      adminHostname = optarg ? optarg : "";
       break;
     case ':': // Missing parameter
       {

catalogue/CreateAdminUserCmdLineArgs.cpp

@@ -45,13 +45,13 @@ CreateAdminUserCmdLineArgs::CreateAdminUserCmdLineArgs(const int argc, char *con
   while((opt = getopt_long(argc, argv, ":c:hu:", longopts, NULL)) != -1) {
     switch(opt) {
     case 'c':
-      comment = optarg;
+      comment = optarg ? optarg : "";
       break;
     case 'h':
       help = true;
       break;
     case 'u':
-      adminUsername = optarg;
+      adminUsername = optarg ? optarg : "";
       break;
     case ':': // Missing parameter
       {