From bd485b59405777191fa289a2fe1b2b38be2c876b Mon Sep 17 00:00:00 2001 From: nkshigeru Date: Thu, 17 May 2012 15:54:34 +0900 Subject: avoid passing NULL to fopen --- tools/mruby/mruby.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index df69c62c2..5de161def 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -105,7 +105,8 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) } - if (args->rfp == NULL && args->cmdline == NULL && (args->rfp = fopen(*argv, args->mrbfile ? "rb" : "r")) == NULL) { + if (args->rfp == NULL && args->cmdline == NULL && + (*argv == NULL || (args->rfp = fopen(*argv, args->mrbfile ? "rb" : "r")) == NULL)) { printf("%s: Cannot open program file. (%s)\n", *origargv, *argv); return 0; } -- cgit v1.2.3 From b6935257a0545fcdfe3558d4906b711b7b5cda13 Mon Sep 17 00:00:00 2001 From: Hiroyuki Iwatsuki Date: Thu, 17 May 2012 19:54:29 +0900 Subject: Updated .gitignore for test/ --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 94a9f5d79..1f700fa66 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ cscope.out /bin /mrblib/mrblib.c /mrblib/*.*tmp +/test/mrbtest +/test/mrbtest.c +/test/*.*tmp -- cgit v1.2.3