changeset 9274:620f5c6b4383

8136532: Outlook paste text into an email causes webkit.ContextMenu NullPointerException Reviewed-by: azvegint, kcr Contributed-by: guru.hb@oracle.com
author azvegint
date Fri, 02 Oct 2015 18:41:04 +0300
parents 3db9e3cf618b
children d4f8c9496683
files modules/web/src/main/native/Source/WebCore/platform/java/DataObjectJava.h
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/modules/web/src/main/native/Source/WebCore/platform/java/DataObjectJava.h	Fri Oct 02 08:32:35 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/DataObjectJava.h	Fri Oct 02 18:41:04 2015 +0300
@@ -157,7 +157,7 @@
         void asFilenames(Vector<String>& result) const {
             if(m_url.isEmpty() && !m_filenames.isEmpty())
                 result = m_filenames;
-            else
+            else if(!m_url.isEmpty())
                 result.append(m_url.string());
         }