fix a few code defects detected by coverity scan

bradparks · Feb 2, 2014 · e12e6c0 · e12e6c0
1 parent 7b804f0
commit e12e6c0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/ccall.cpp b/src/ccall.cpp
@@ -557,7 +557,6 @@ static Value *emit_cglobal(jl_value_t **args, size_t nargs, jl_codectx_t *ctx)
                     msg << sym.f_lib;
                 }
                 emit_error(msg.str(), ctx);
-                res = literal_static_pointer_val(NULL, lrt);
             }
             // since we aren't saving this code, there's no sense in
             // putting anything complicated here: just JIT the address of the cglobal

diff --git a/src/jl_uv.c b/src/jl_uv.c
@@ -136,6 +136,7 @@ jl_value_t *jl_callback_call(jl_function_t *f,jl_value_t *val,int count,...)
             break;
         }
     }
+    va_end(argp);
     v = jl_apply(f,(jl_value_t**)argv,count);
     JL_GC_POP();
     return v;

diff --git a/ui/repl-readline.c b/ui/repl-readline.c
@@ -311,7 +311,10 @@ int complete_method_table()
     char **methods = malloc(sizeof(char *)*(nallocmethods+1));
     methods[0] = NULL;
     methods[1] = strtok_r(completions, "\n", &strtok_saveptr);
-    if (methods[1] == NULL) return 0;
+    if (methods[1] == NULL) {
+       free(methods);
+       return 0;
+    }
     int maxlen = strlen(methods[1]);
     int nmethods = 1;
 

diff --git a/ui/repl.c b/ui/repl.c
@@ -118,7 +118,7 @@ void parse_opts(int *argcp, char ***argvp)
     }
     if (image_file) {
         if (image_file[0] != PATHSEP) {
-            struct stat stbuf;
+            uv_stat_t stbuf;
             char path[512];
             if (!imagepathspecified) {
                 // build time path relative to JULIA_HOME