Fix else-after-returns throughout pdfium.

fpdfsdk/src/javascript/global.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_EventHandler.h"
@@ skipping 175 matching lines @@
                         {
                                 DelProperty(cc, propname, sError);
                                 return TRUE;
                         }
                 default:
                         return FALSE;
                 }
         }
         else
         {
-                js_global_data* pData = NULL;
-                CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
-
-                if (m_mapGlobal.Lookup(sPropName, (void*&)pData))

[Tom Sepez, 2015/07/20 23:59:58]

note: fix illegal cast while were at it.

-                {
-                        if (pData)
-                        {
-                                if (!pData->bDeleted)
-                                {
-                                        switch (pData->nType)
-                                        {
-                                        case JS_GLOBALDATA_TYPE_NUMBER:
-                                                vp << pData->dData;
-                                                break;
-                                        case JS_GLOBALDATA_TYPE_BOOLEAN:
-                                                vp << pData->bData;
-                                                break;
-                                        case JS_GLOBALDATA_TYPE_STRING:
-                                                vp << pData->sData;
-                                                break;
-                                        case JS_GLOBALDATA_TYPE_OBJECT:
-                                                {
-                                                        v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(vp.GetIsolate(),pData->pData);
-                                                        vp << obj;
-                                                        break;
-                                                }
-                                        case JS_GLOBALDATA_TYPE_NULL:
-                                                vp.SetNull();
-                                                break;
-                                        default:
-                                                return FALSE;
-                                        }
-                                        return TRUE;
-                                }
-                                else
-                                {
-                                        return TRUE;
-                                }
-                        }
-                        else
-                        {
-                                vp.SetNull();
-                                return TRUE;
-                        }
-                }
-                else
+                void* pVoid = nullptr;
+                if (!m_mapGlobal.Lookup(CFX_ByteString::FromUnicode(propname), pVoid))
                 {
                         vp.SetNull();
                         return TRUE;
                 }
+        if (!pVoid)
+        {
+            vp.SetNull();
+            return TRUE;
+        }
+                js_global_data* pData = (js_global_data*)pVoid;
+        if (pData->bDeleted)
+            return TRUE;
+
+        switch (pData->nType)
+        {
+            case JS_GLOBALDATA_TYPE_NUMBER:
+                vp << pData->dData;
+                break;
+            case JS_GLOBALDATA_TYPE_BOOLEAN:
+                vp << pData->bData;
+                break;
+            case JS_GLOBALDATA_TYPE_STRING:
+                vp << pData->sData;
+                break;
+            case JS_GLOBALDATA_TYPE_OBJECT:
+                {
+                    v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(vp.GetIsolate(),pData->pData);
+                    vp << obj;
+                    break;
+                }
+            case JS_GLOBALDATA_TYPE_NULL:
+                vp.SetNull();
+                break;
+            default:
+                return FALSE;
+        }
+        return TRUE;

[Lei Zhang, 2015/07/21 23:43:23]

This can't be reached because of the "default" 3 lines above.

[Tom Sepez, 2015/07/22 20:38:24]

Killed defaults, breaks => returns to match if-body, and return false at bottom
if all else failed.

         }
-
         return FALSE;
 }
 
 FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (params.size() != 2)
         {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
@@ skipping 355 matching lines @@
   if (nHash == JSCONST_nDateHash)
     return VT_date;
   if (nHash == JSCONST_nObjectHash)
     return VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return VT_fxobject;
 
   return VT_unknown;
 }