diff options
| author | stuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:38:42 +0000 |
|---|---|---|
| committer | stuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:38:42 +0000 |
| commit | 289fdf862c649d17ddb2e08295304efb98f641f6 (patch) | |
| tree | 9dc984e7f0c7f70331dee68009781392fdf04cbf | |
| parent | c2e9a08485fbf79c328e4b7979e49b378d69c4be (diff) | |
| download | chromium_src-289fdf862c649d17ddb2e08295304efb98f641f6.zip chromium_src-289fdf862c649d17ddb2e08295304efb98f641f6.tar.gz chromium_src-289fdf862c649d17ddb2e08295304efb98f641f6.tar.bz2 | |
Skip STR resources in Mac plugins that we can't convert to CFStrings
BUG=18371
TEST=unknown
Review URL: http://codereview.chromium.org/159869
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22429 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/plugins/plugin_lib_mac.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm index 23e4572..d0e2cd5 100644 --- a/webkit/glue/plugins/plugin_lib_mac.mm +++ b/webkit/glue/plugins/plugin_lib_mac.mm @@ -156,6 +156,8 @@ bool GetSTRResource(CFBundleRef bundle, short res_id, (unsigned char*)pointer, GetApplicationTextEncoding(), // is this right? kCFAllocatorNull)); // perhaps CFStringGetSystemEncoding? + if (!str.get()) + return false; contents->push_back(base::SysCFStringRefToUTF8(str.get())); pointer += 1+*pointer; } |