diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-17 00:47:38 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-17 00:47:38 -0700 |
| commit | fd14730f95728f55cb70528a1f9f4e5418e9dc0e (patch) | |
| tree | c1a87fc0bebfad313d508b4d99a7d34e1baa007b | |
| parent | 490fa452983b66048ce796f853b80bfae60c0388 (diff) | |
| parent | bd485b59405777191fa289a2fe1b2b38be2c876b (diff) | |
| download | mruby-fd14730f95728f55cb70528a1f9f4e5418e9dc0e.tar.gz mruby-fd14730f95728f55cb70528a1f9f4e5418e9dc0e.zip | |
Merge pull request #155 from nkshigeru/msvc
avoid passing NULL to fopen
| -rw-r--r-- | tools/mruby/mruby.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |