Security-58286.70.7.tar.gz

[apple/security.git] / lib / SecArgParse.c

diff --git a/lib/SecArgParse.c b/lib/SecArgParse.c
index 3a326ac6c3aebaaf808972bb0ae007e36ddf4e64..c0b43cf0b5f5d605968be68f73fb33f7dea82e94 100644 (file)
--- a/lib/SecArgParse.c
+++ b/lib/SecArgParse.c
@@ -145,7 +145,7 @@ bool options_parse(int argc, char * const *argv, struct arguments* args) {
         realargs.arguments[i+1] = args->arguments[i];
     }
 
         realargs.arguments[i+1] = args->arguments[i];
     }
 

-    struct option* long_options = (struct option*) malloc((noptions+1) * sizeof(struct option));
+    struct option* long_options = (struct option*) calloc((noptions+1), sizeof(struct option));

     size_t short_options_length = 2* noptions * sizeof(char) + 2; // 2: one for -h, one for the null terminator
     char* short_options = (char*) malloc(short_options_length);
 
     size_t short_options_length = 2* noptions * sizeof(char) + 2; // 2: one for -h, one for the null terminator
     char* short_options = (char*) malloc(short_options_length);
 


@@ -165,7 +165,7 @@ bool options_parse(int argc, char * const *argv, struct arguments* args) {
                 struct option* long_option = &long_options[option_index];
 
                 for(size_t i = 0; i < noptions; i++) {
                 struct option* long_option = &long_options[option_index];
 
                 for(size_t i = 0; i < noptions; i++) {

-                    if(realargs.arguments[i].longname && strncmp(long_option->name, realargs.arguments[i].longname, strlen(realargs.arguments[i].longname)) == 0) {
+                    if(realargs.arguments[i].longname && long_option->name && strncmp(long_option->name, realargs.arguments[i].longname, strlen(realargs.arguments[i].longname)) == 0) {

                         trigger(realargs.arguments[i], optarg);
                     }
                 }
                         trigger(realargs.arguments[i], optarg);
                     }
                 }


@@ -185,7 +185,8 @@ bool options_parse(int argc, char * const *argv, struct arguments* args) {
                 }
             }
             if(i == noptions) {
                 }
             }
             if(i == noptions) {

-                return false;
+                success = false;
+                goto out;

             }
         }
     }
             }
         }
     }