Merge pull request #704 from atambo/kernel_exec_error_on_null_byte

Kernel.exec should raise an ArgumentError if the command includes a null byte
jruby · May 4, 2013 · d90f2db · d90f2db
2 parents 48dd511 + acaec7a
commit d90f2db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/spec/tags/1.8/ruby/core/kernel/exec_tags.txt b/spec/tags/1.8/ruby/core/kernel/exec_tags.txt
@@ -1,10 +1,8 @@
-fails:Kernel#exec raises an ArgumentError if the command includes a null byte
 fails:Kernel#exec raises Errno::EACCES when passed a directory
 fails:Kernel#exec with a single argument subjects the specified command to shell expansion
 fails:Kernel#exec with a command array uses the first element as the command name and the second as the argv[0] value
 fails:Kernel#exec with a command array coerces the argument using to_ary
 fails:Kernel#exec with a command array raises Argument error if the Array does not have exactly two elements
-fails:Kernel.exec raises an ArgumentError if the command includes a null byte
 fails:Kernel.exec raises Errno::EACCES when passed a directory
 fails:Kernel.exec with a single argument subjects the specified command to shell expansion
 fails:Kernel.exec with a command array uses the first element as the command name and the second as the argv[0] value

diff --git a/spec/tags/1.9/ruby/core/kernel/exec_tags.txt b/spec/tags/1.9/ruby/core/kernel/exec_tags.txt
@@ -1,11 +1,9 @@
-fails:Kernel#exec raises an ArgumentError if the command includes a null byte
 fails:Kernel#exec raises Errno::EACCES when passed a directory
 fails:Kernel#exec unsets other environment variables when given a true :unsetenv_others option
 fails:Kernel#exec sets the current directory when given the :chdir option
 fails:Kernel#exec with a single argument subjects the specified command to shell expansion
 fails:Kernel#exec with a command array uses the first element as the command name and the second as the argv[0] value
 fails:Kernel#exec with a command array coerces the argument using to_ary
-fails:Kernel.exec raises an ArgumentError if the command includes a null byte
 fails:Kernel.exec raises Errno::EACCES when passed a directory
 fails:Kernel.exec unsets other environment variables when given a true :unsetenv_others option
 fails:Kernel.exec sets the current directory when given the :chdir option

diff --git a/src/org/jruby/RubyKernel.java b/src/org/jruby/RubyKernel.java
@@ -1755,8 +1755,17 @@ public static IRubyObject _exec_internal(ThreadContext context, IRubyObject recv
 
     private static IRubyObject execCommon(Ruby runtime, IRubyObject env, IRubyObject prog, IRubyObject options, IRubyObject[] args) {
         // This is a fairly specific hack for empty string, but it does the job
-        if (args.length == 1 && args[0].convertToString().isEmpty()) {
-            throw runtime.newErrnoENOENTError(args[0].convertToString().toString());
+        if (args.length == 1) {
+            RubyString command = args[0].convertToString();
+            if (command.isEmpty()) {
+                throw runtime.newErrnoENOENTError(command.toString());
+            } else {
+                for(byte b : command.getBytes()) {
+                    if (b == 0x00) {
+                        throw runtime.newArgumentError("string contains null byte");
+                    }
+                }
+            }
         }
 
         ThreadContext context = runtime.getCurrentContext();