Fix a bug where if a PAC script ended with a comment and no newline, it would...

net/proxy/proxy_resolver_v8.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "net/proxy/proxy_resolver_v8.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_log.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_resolver_js_bindings.h"
 #include "net/proxy/proxy_resolver_script.h"
 #include "v8/include/v8.h"
 
 namespace net {
 
 namespace {
 
 // Pseudo-name for the PAC script.
 const char kPacResourceName[] = "proxy-pac-script.js";
+// Pseudo-name for the PAC utility script.
+const char kPacUtilityResourceName[] = "proxy-pac-utility-script.js";
 
 // Convert a V8 String to a std::string.
 std::string V8StringToStdString(v8::Handle<v8::String> s) {
   int len = s->Utf8Length();
   std::string result;
   s->WriteUtf8(WriteInto(&result, len + 1), len);
   return result;
 }
 
 // Convert a std::string (UTF8) to a V8 string.
@@ skipping 90 matching lines @@
 
     v8::Local<v8::FunctionTemplate> dns_resolve_template =
         v8::FunctionTemplate::New(&DnsResolveCallback, v8_this_);
     global_template->Set(v8::String::New("dnsResolve"),
         dns_resolve_template);
 
     v8_context_ = v8::Context::New(NULL, global_template);
 
     v8::Context::Scope ctx(v8_context_);
 
-    v8::TryCatch try_catch;
+    // Add the PAC utility functions to the environment.
+    // (This script should never fail, as it is a string literal!)
+    int rv = RunScript(PROXY_RESOLVER_SCRIPT, kPacUtilityResourceName);
+    if (rv != OK) {
+      NOTREACHED();
+      return rv;
+    }
 
-    // Compile the script, including the PAC library functions.
-    std::string text_raw_utf8 = pac_data_utf8 + PROXY_RESOLVER_SCRIPT;
-    v8::Local<v8::String> text = StdStringToV8String(text_raw_utf8);
-    v8::ScriptOrigin origin = v8::ScriptOrigin(
-        v8::String::New(kPacResourceName));
-    v8::Local<v8::Script> code = v8::Script::Compile(text, &origin);
-
-    // Execute.
-    if (!code.IsEmpty())
-      code->Run();
-
-    if (try_catch.HasCaught()) {
-      HandleError(try_catch.Message());
-      return ERR_PAC_SCRIPT_FAILED;
-    }
+    // Add the user's PAC code to the environment.
+    rv = RunScript(pac_data_utf8, kPacResourceName);
+    if (rv != OK)
+      return rv;
 
     // At a minimum, the FindProxyForURL() function must be defined for this
     // to be a legitimiate PAC script.
     v8::Local<v8::Value> function;
     if (!GetFindProxyForURL(&function))
       return ERR_PAC_SCRIPT_FAILED;
 
     return OK;
   }
 
@@ skipping 12 matching lines @@
     if (message.IsEmpty())
       return;
 
     // Otherwise dispatch to the bindings.
     int line_number = message->GetLineNumber();
     std::string error_message;
     V8ObjectToString(message->Get(), &error_message);
     js_bindings_->OnError(line_number, error_message);
   }
 
+  // Compiles and runs |script_utf8| in the current V8 context.
+  // Returns OK on success, otherwise an error code.
+  int RunScript(const std::string& script_utf8, const char* script_name) {
+    v8::TryCatch try_catch;
+
+    // Compile the script.
+    v8::Local<v8::String> text = StdStringToV8String(script_utf8);
+    v8::ScriptOrigin origin = v8::ScriptOrigin(v8::String::New(script_name));
+    v8::Local<v8::Script> code = v8::Script::Compile(text, &origin);
+
+    // Execute.
+    if (!code.IsEmpty())
+      code->Run();
+
+    // Check for errors.
+    if (try_catch.HasCaught()) {
+      HandleError(try_catch.Message());
+      return ERR_PAC_SCRIPT_FAILED;
+    }
+
+    return OK;
+  }
+
   // V8 callback for when "alert()" is invoked by the PAC script.
   static v8::Handle<v8::Value> AlertCallback(const v8::Arguments& args) {
     Context* context =
         static_cast<Context*>(v8::External::Cast(*args.Data())->Value());
 
     // Like firefox we assume "undefined" if no argument was specified, and
     // disregard any arguments beyond the first.
     std::string message;
     if (args.Length() == 0) {
       message = "undefined";
@@ skipping 100 matching lines @@
 
   // Try parsing the PAC script.
   scoped_ptr<Context> context(new Context(js_bindings_.get()));
   int rv = context->InitV8(bytes_utf8);
   if (rv == OK)
     context_.reset(context.release());
   return rv;
 }
 
 }  // namespace net