You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by rg...@apache.org on 2016/03/21 19:36:34 UTC

tika git commit: TIKA-1906: ExternalParser No Longer Supports Commands in Array Format - Added check for command length and reintroduced copying all arguments for arrays

Repository: tika
Updated Branches:
  refs/heads/master 4a40cf5fc -> 73aaa1bce


TIKA-1906: ExternalParser No Longer Supports Commands in Array Format
  - Added check for command length and reintroduced copying all
arguments for arrays

Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/73aaa1bc
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/73aaa1bc
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/73aaa1bc

Branch: refs/heads/master
Commit: 73aaa1bcee194e8fa73cb0c3cd60ae2eb3205bf9
Parents: 4a40cf5
Author: rgauss <rg...@rgauss.com>
Authored: Mon Mar 21 14:36:01 2016 -0400
Committer: rgauss <rg...@rgauss.com>
Committed: Mon Mar 21 14:36:01 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/tika/parser/external/ExternalParser.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/73aaa1bc/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
index 1515de6..ab50f01 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java
@@ -160,7 +160,13 @@ public class ExternalParser extends AbstractParser {
         File output = null;
 
         // Build our command
-        String[] cmd = command[0].split(" ");
+        String[] cmd;
+        if (command.length == 1) {
+            cmd = command[0].split(" ");
+        } else {
+            cmd = new String[command.length];
+            System.arraycopy(command, 0, cmd, 0, command.length);
+        }
         for(int i=0; i<cmd.length; i++) {
            if(cmd[i].indexOf(INPUT_FILE_TOKEN) != -1) {
               cmd[i] = cmd[i].replace(INPUT_FILE_TOKEN, stream.getFile().getPath());