From e58ec3372190b0f9e294351a4e1ca603da01ca72 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 5 Jun 2012 10:21:22 +0000 Subject: [PATCH] * process.c (rb_exec_fillarg): bail out a loop eagerly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ process.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62f9a99ad6..b4098d2f7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jun 5 19:21:10 2012 Tanaka Akira + + * process.c (rb_exec_fillarg): bail out a loop eagerly. + Tue Jun 5 19:15:14 2012 Tanaka Akira * process.c: add comments about async-signal-safe. diff --git a/process.c b/process.c index acd7834671..90d828eb8f 100644 --- a/process.c +++ b/process.c @@ -1805,10 +1805,12 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, str int has_meta = 0; int has_nonspace = 0; for (p = RSTRING_PTR(prog); *p; p++) { - if (*p != ' ' && *p != '\t') + if (!has_nonspace && *p != ' ' && *p != '\t') has_nonspace = 1; - if (strchr("*?{}[]<>()~&|\\$;'`\"\n", *p)) + if (!has_meta && strchr("*?{}[]<>()~&|\\$;'`\"\n", *p)) has_meta = 1; + if (has_nonspace && has_meta) + break; } if (has_nonspace && !has_meta) { /* avoid shell since no shell meta charactor found. */