Merge pull request #407 from ChadKillingsworth/master

Ensure any output_wrapper flags contain a valid marker

Author: concavelenz

src/com/google/javascript/jscomp/CommandLineRunner.java

@@ -728,6 +728,14 @@ private void initConfigFromFlags(String[] args, PrintStream err) {
       flags.closureEntryPoint = Lists.newArrayList(
           ProcessCommonJSModules.toModuleName(flags.commonJsEntryModule));
     }
+    
+    if (!(flags.outputWrapper == null ||
+        flags.outputWrapper.contains(CommandLineRunner.OUTPUT_MARKER)))
+    {
+      err.println("ERROR - invalid output_wrapper specified. Missing '" +
+          CommandLineRunner.OUTPUT_MARKER + "'.");
+      isConfigValid = false;
+    }
 
     if (!isConfigValid || flags.displayHelp) {
       isConfigValid = false;

src/com/google/javascript/jscomp/ant/CompileTask.java

@@ -330,6 +330,9 @@ public void execute() {
             int suffixStart = pos + CommandLineRunner.OUTPUT_MARKER.length();
             String suffix = this.outputWrapper.substring(suffixStart);
             source.append(suffix);
+          } else {
+            throw new BuildException("Invalid output_wrapper specified. " +
+                "Missing '" + CommandLineRunner.OUTPUT_MARKER + "'.");
           }
         }
 

test/com/google/javascript/jscomp/CommandLineRunnerTest.java

@@ -1217,6 +1217,16 @@ public void testOutputSameAsInput() {
     args.add("--js_output_file=" + getFilename(0));
     test("", AbstractCommandLineRunner.OUTPUT_SAME_AS_INPUT_ERROR);
   }
+  
+  public void testOutputWrapperFlag() {
+    // if the output wrapper flag is specified without a valid output marker,
+    // ensure that the compiler displays an error and exits.
+    // See github issue 123
+    args.add("--output_wrapper=output");
+    assertFalse(
+        createCommandLineRunner(
+            new String[] {"function f() {}"}).shouldRunCompiler());
+  }
 
   /* Helper functions */