summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorbbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 20:17:44 +0000
committerbbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 20:17:44 +0000
commit33d73079fae63ad533660d454d863f1925d331d2 (patch)
tree4f0e468f0e387748ca9ae5fe2597f5511b94f703 /ppapi
parent04a5ef8f994fc0734303d6a27f21c08647d5fb85 (diff)
downloadchromium_src-33d73079fae63ad533660d454d863f1925d331d2.zip
chromium_src-33d73079fae63ad533660d454d863f1925d331d2.tar.gz
chromium_src-33d73079fae63ad533660d454d863f1925d331d2.tar.bz2
Fix crash in PPB_FileChooser_Dev proxy.
BUG=100419 TEST=manual Review URL: http://codereview.chromium.org/8298017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppb_file_chooser_proxy.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/ppb_file_chooser_proxy.cc b/ppapi/proxy/ppb_file_chooser_proxy.cc
index 261f9f3..1c7907c 100644
--- a/ppapi/proxy/ppb_file_chooser_proxy.cc
+++ b/ppapi/proxy/ppb_file_chooser_proxy.cc
@@ -125,7 +125,7 @@ int32_t FileChooser::Show(bool require_user_gesture,
INTERFACE_ID_PPB_FILE_CHOOSER,
host_resource(),
save_as,
- suggested_file_name,
+ suggested_file_name ? suggested_file_name : "",
require_user_gesture));
return PP_OK_COMPLETIONPENDING;
}
@@ -191,7 +191,7 @@ PP_Resource PPB_FileChooser_Proxy::CreateProxyResource(
dispatcher->Send(new PpapiHostMsg_PPBFileChooser_Create(
INTERFACE_ID_PPB_FILE_CHOOSER, instance,
mode,
- accept_mime_types,
+ accept_mime_types ? accept_mime_types : "",
&result));
if (result.is_null())