Fix crash issue when favicon is null.

When favicon of web page is null, it would cause crash.
This patch is to add a check if pixel data is null or not.

Change-Id: Ic00958c21e15a3d986e9253c9d26da90446ca926

diff --git a/dali-csharp-binder/src/web-view.cpp b/dali-csharp-binder/src/web-view.cpp
index 062a36a..9b11e1a 100755 (executable)
--- a/dali-csharp-binder/src/web-view.cpp
+++ b/dali-csharp-binder/src/web-view.cpp
@@ -454,7 +454,11 @@ SWIGEXPORT const void * SWIGSTDCALL CSharp_Dali_WebView_GetFavicon(void * jarg1)
   Dali::Toolkit::ImageView* result = 0;
   {
     try {
-      result = (Dali::Toolkit::ImageView*)&(arg1)->GetFavicon();
+      Dali::Toolkit::ImageView favicon = (arg1)->GetFavicon();
+      if (favicon)
+      {
+        result = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)favicon);
+      }
     } CALL_CATCH_EXCEPTION(0);
   }
   return result;
@@ -872,22 +876,27 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_AddDynamicCertificatePath(void *
 SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_WebView_GetScreenshot(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::WebView *arg1 = (Dali::Toolkit::WebView *)jarg1;
   Dali::Rect<int32_t> *arg = (Dali::Rect<int32_t> *)jarg2;
-  Dali::Toolkit::ImageView result;
+  Dali::Toolkit::ImageView* result = 0;
   {
     try {
-      result = (arg1)->GetScreenshot(*arg, jarg3);
+      Dali::Toolkit::ImageView screenshot = (arg1)->GetScreenshot(*arg, jarg3);
+      if (screenshot)
+      {
+        result = new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)screenshot);
+      }
     } CALL_CATCH_EXCEPTION(0);
   }
-  void * jresult =
-      new Dali::Toolkit::ImageView((const Dali::Toolkit::ImageView &)result);
-  return jresult;
+  return result;
 }
 
 using SWIG_CallbackWebViewScreenshotCaptured = void(SWIGSTDCALL *)(Dali::Toolkit::ImageView *);
 SWIG_CallbackWebViewScreenshotCaptured swig_callbackOnWebViewScreenshotCaptured;
 
 void OnWebViewScreenshotCapturedCallback(Dali::Toolkit::ImageView imageView) {
-  Dali::Toolkit::ImageView *pImageView = &imageView;
+  if (!imageView)
+    return;
+
+  Dali::Toolkit::ImageView* pImageView = &imageView;
   swig_callbackOnWebViewScreenshotCaptured(pImageView);
 }