diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 23:37:31 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 23:37:31 +0000 |
| commit | a01665c91a9b9a23a8c8979c087140531c809de5 (patch) | |
| tree | 64b7192be49b30de6b64b731b9395882f8192a5d /webkit/plugins | |
| parent | fddfff8218c665d92d3c78666dd9682312489ba5 (diff) | |
| download | chromium_src-a01665c91a9b9a23a8c8979c087140531c809de5.zip chromium_src-a01665c91a9b9a23a8c8979c087140531c809de5.tar.gz chromium_src-a01665c91a9b9a23a8c8979c087140531c809de5.tar.bz2 | |
Fix a regression in the NPAPI NPN_GetValueForURL function which is used by plugins to retrieve proxy information
and cookies. The regression caused incorrect proxy information to be returned back to the plugin (java).
For the curious we were incorrectly assigning a function returning a bool to an std string which was eventually
used to return the proxy info back to the plugin.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=103885
BUG=103885
R=vtl
Review URL: http://codereview.chromium.org/8995017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/npapi/plugin_host.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index e54346ba..dbd4052 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -1011,7 +1011,8 @@ NPError NPN_GetValueForURL(NPP id, if (!webplugin) return NPERR_GENERIC_ERROR; - result = webplugin->FindProxyForUrl(GURL(std::string(url)), &result); + if (!webplugin->FindProxyForUrl(GURL(std::string(url)), &result)) + return NPERR_GENERIC_ERROR; break; } case NPNURLVCookie: { |