diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 04:52:31 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 04:52:31 +0000 |
| commit | d1838364026ff62ca07323b79a45f2695cefedb7 (patch) | |
| tree | 03e4c69b2235050355def87b80abcb01c80cb57b | |
| parent | 814614991092271ab858d008858b7c5994ef498c (diff) | |
| download | chromium_src-d1838364026ff62ca07323b79a45f2695cefedb7.zip chromium_src-d1838364026ff62ca07323b79a45f2695cefedb7.tar.gz chromium_src-d1838364026ff62ca07323b79a45f2695cefedb7.tar.bz2 | |
Remove NOTREACHED from CopyPPVar
In some rare cases, a complex type may be sent via PostMessage to an in-process
plugin. In these cases, we can just return an undefined var because the
intended behaviour is to drop the var anyway. See the associated bug for
details.
BUG=318837
Review URL: https://codereview.chromium.org/75783003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236153 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/pepper/message_channel.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/pepper/message_channel.cc b/content/renderer/pepper/message_channel.cc index 8516777..c14009b 100644 --- a/content/renderer/pepper/message_channel.cc +++ b/content/renderer/pepper/message_channel.cc @@ -105,8 +105,9 @@ PP_Var CopyPPVar(const PP_Var& var) { case PP_VARTYPE_ARRAY: case PP_VARTYPE_DICTIONARY: case PP_VARTYPE_RESOURCE: - // These types are not supported by PostMessage in-process. - NOTREACHED(); + // These types are not supported by PostMessage in-process. In some rare + // cases with the NaCl plugin, they may be sent but they will be dropped + // anyway (see crbug.com/318837 for details). return PP_MakeUndefined(); } NOTREACHED(); |