Fix else-after-returns throughout pdfium.

fpdfsdk/src/javascript/Document.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/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 619 matching lines @@
 {
   // Unsafe, not supported.
   return TRUE;
 }
 
 
 FX_BOOL Document::submitForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
         CJS_Context* pContext = (CJS_Context*)cc;
+    CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[Lei Zhang, 2015/07/21 21:44:47]

Why move this up here when we don't use it until much later? Maybe put it around
line 680?

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

Ah, right.  I was de-duplicating them but the can go later.

         int nSize = params.size();
         if (nSize < 1) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         CFX_WideString strURL;
         FX_BOOL bFDF = TRUE;
         FX_BOOL bEmpty = FALSE;
         v8::Isolate* isolate = GetIsolate(cc);
@@ skipping 18 matching lines @@
                         strURL = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToCFXWideString();
                 pValue = JS_GetObjectElement(isolate, pObj, L"bFDF");
                 bFDF = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToBool();
                 pValue = JS_GetObjectElement(isolate, pObj, L"bEmpty");
                 bEmpty = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToBool();
                 pValue = JS_GetObjectElement(isolate, pObj,L"aFields");
                 aFields.Attach(CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToV8Array());
         }
 
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
-        ASSERT(pInterForm != NULL);
         CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
-        ASSERT(pPDFInterForm != NULL);
-
         FX_BOOL bAll = (aFields.GetLength() == 0);
-
         if (bAll && bEmpty)
         {
-                CJS_Context* pContext = (CJS_Context*)cc;
-                ASSERT(pContext != NULL);
-                CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-                ASSERT(pRuntime != NULL);
-
-
                 if (pPDFInterForm->CheckRequiredFields())
                 {
                         pRuntime->BeginBlock();
                         pInterForm->SubmitForm(strURL, FALSE);
                         pRuntime->EndBlock();
                 }
-
-                return TRUE;
-        }
-        else
-        {
-                CFX_PtrArray fieldObjects;
-
-                for (int i=0,sz=aFields.GetLength(); i<sz; i++)
-                {
-                        CJS_Value valName(isolate);
-                        aFields.GetElement(i, valName);
-                        CFX_WideString sName = valName.ToCFXWideString();
-
-                        CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
-                        ASSERT(pPDFForm != NULL);
-
-                        for (int j=0, jsz=pPDFForm->CountFields(sName); j<jsz; j++)
-                        {
-                                CPDF_FormField* pField = pPDFForm->GetField(j, sName);
-                                if (!bEmpty && pField->GetValue().IsEmpty())
-                                        continue;
-
-                                fieldObjects.Add(pField);
-                        }
-                }
-
-                CJS_Context* pContext = (CJS_Context*)cc;
-                ASSERT(pContext != NULL);
-                CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-                ASSERT(pRuntime != NULL);
-
-
-                if (pPDFInterForm->CheckRequiredFields(&fieldObjects, TRUE))
-                {
-                        pRuntime->BeginBlock();
-                        pInterForm->SubmitFields(strURL, fieldObjects, TRUE, !bFDF);
-                        pRuntime->EndBlock();
-                }
-
                 return TRUE;
         }
 
+    CFX_PtrArray fieldObjects;
+    for (int i=0,sz=aFields.GetLength(); i<sz; i++)
+    {
+        CJS_Value valName(isolate);
+        aFields.GetElement(i, valName);
+
+        CFX_WideString sName = valName.ToCFXWideString();
+        CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
+        for (int j = 0, jsz = pPDFForm->CountFields(sName); j < jsz; ++j)
+        {
+            CPDF_FormField* pField = pPDFForm->GetField(j, sName);
+            if (!bEmpty && pField->GetValue().IsEmpty())
+                continue;
+
+            fieldObjects.Add(pField);
+        }
+    }
+
+    if (pPDFInterForm->CheckRequiredFields(&fieldObjects, TRUE))
+    {
+        pRuntime->BeginBlock();
+        pInterForm->SubmitFields(strURL, fieldObjects, TRUE, !bFDF);
+        pRuntime->EndBlock();
+    }
+    return TRUE;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 
 void Document::AttachDoc(CPDFSDK_Document *pDoc)
 {
         m_pDocument = pDoc;
 }
 
 CPDFSDK_Document * Document::GetReaderDoc()
@@ skipping 101 matching lines @@
                 m_pDocument->SetChangeMark();
                 return TRUE;
         }
 }
 
 FX_BOOL Document::info(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         CFX_WideString cwAuthor                 = pDictionary->GetUnicodeText("Author");
         CFX_WideString cwTitle                  = pDictionary->GetUnicodeText("Title");
         CFX_WideString cwSubject                = pDictionary->GetUnicodeText("Subject");
         CFX_WideString cwKeywords               = pDictionary->GetUnicodeText("Keywords");
         CFX_WideString cwCreator                = pDictionary->GetUnicodeText("Creator");
         CFX_WideString cwProducer               = pDictionary->GetUnicodeText("Producer");
         CFX_WideString cwCreationDate   = pDictionary->GetUnicodeText("CreationDate");
         CFX_WideString cwModDate                = pDictionary->GetUnicodeText("ModDate");
         CFX_WideString cwTrapped                = pDictionary->GetUnicodeText("Trapped");
 
         v8::Isolate* isolate = GetIsolate(cc);
         if (vp.IsGetting())
         {
                 CJS_Context* pContext = (CJS_Context *)cc;
                 CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-
                 JSFXObject  pObj = JS_NewFxDynamicObj(*pRuntime, pContext, -1);
-
                 JS_PutObjectString(isolate, pObj, L"Author", cwAuthor.c_str());
                 JS_PutObjectString(isolate, pObj, L"Title", cwTitle.c_str());
                 JS_PutObjectString(isolate, pObj, L"Subject", cwSubject.c_str());
                 JS_PutObjectString(isolate, pObj, L"Keywords", cwKeywords.c_str());
                 JS_PutObjectString(isolate, pObj, L"Creator", cwCreator.c_str());
                 JS_PutObjectString(isolate, pObj, L"Producer", cwProducer.c_str());
                 JS_PutObjectString(isolate, pObj, L"CreationDate", cwCreationDate.c_str());
                 JS_PutObjectString(isolate, pObj, L"ModDate", cwModDate.c_str());
                 JS_PutObjectString(isolate, pObj, L"Trapped", cwTrapped.c_str());
 
-// It's to be compatible to non-standard info dictionary.
+        // It's to be compatible to non-standard info dictionary.
                 FX_POSITION pos = pDictionary->GetStartPos();
                 while(pos)
                 {
                         CFX_ByteString bsKey;
                         CPDF_Object* pValueObj = pDictionary->GetNextElement(pos, bsKey);
                         CFX_WideString wsKey  = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength());
                         if((pValueObj->GetType()==PDFOBJ_STRING) || (pValueObj->GetType()==PDFOBJ_NAME) )
                                 JS_PutObjectString(isolate, pObj, wsKey.c_str(), pValueObj->GetUnicodeText().c_str());
                         if(pValueObj->GetType()==PDFOBJ_NUMBER)
                                 JS_PutObjectNumber(isolate,pObj, wsKey.c_str(), (float)pValueObj->GetNumber());
                         if(pValueObj->GetType()==PDFOBJ_BOOLEAN)
                                 JS_PutObjectBoolean(isolate,pObj, wsKey.c_str(), (bool)pValueObj->GetInteger());
                 }
-
                 vp << pObj;
-                return TRUE;
         }
-        else
-        {
-                return TRUE;
-        }
+    return TRUE;
 }
 
 FX_BOOL Document::creationDate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
-
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("CreationDate");
-                return TRUE;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 CFX_WideString csCreationDate;
                 vp >> csCreationDate;
                 pDictionary->SetAtString("CreationDate", PDF_EncodeText(csCreationDate));
                 m_pDocument->SetChangeMark();
-
-                return TRUE;
         }
+    return TRUE;
 }
 
 FX_BOOL Document::creator(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
-
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Creator");
-                return TRUE;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 CFX_WideString csCreator;
                 vp >> csCreator;
                 pDictionary->SetAtString("Creator", PDF_EncodeText(csCreator));
                 m_pDocument->SetChangeMark();
-                return TRUE;
         }
+    return TRUE;
 }
 
 FX_BOOL Document::delay(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsGetting())
         {
                 vp << m_bDelay;
-                return TRUE;
         }
         else
         {
-                ASSERT(m_pDocument != NULL);
-
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 bool b;
                 vp >> b;
-
                 m_bDelay = b;
-
                 if (m_bDelay)
                 {
                         for (int i=0,sz=m_DelayData.GetSize(); i<sz; i++)
                                 delete m_DelayData.GetAt(i);
 
                         m_DelayData.RemoveAll();
                 }
                 else
                 {
                         CFX_ArrayTemplate<CJS_DelayData*> DelayDataToProcess;
-
                         for (int i=0,sz=m_DelayData.GetSize(); i < sz; i++)
                         {
                                 if (CJS_DelayData* pData = m_DelayData.GetAt(i))
                                 {
                                         DelayDataToProcess.Add(pData);
                                         m_DelayData.SetAt(i, NULL);
                                 }
                         }
                         m_DelayData.RemoveAll();
-
                         for (int i=0,sz=DelayDataToProcess.GetSize(); i < sz; i++)
                         {
                                 CJS_DelayData* pData = DelayDataToProcess.GetAt(i);
                                 Field::DoDelay(m_pDocument, pData);
                                 DelayDataToProcess.SetAt(i,NULL);
                                 delete pData;
                         }
                 }
-
-                return TRUE;
-        }
+    }
+    return TRUE;
 }
 
 FX_BOOL Document::keywords(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
-
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Keywords");
-                return TRUE;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 CFX_WideString csKeywords;
                 vp >> csKeywords;
                 pDictionary->SetAtString("Keywords", PDF_EncodeText(csKeywords));
                 m_pDocument->SetChangeMark();
-                return TRUE;
         }
+    return TRUE;
 }
 
 FX_BOOL Document::modDate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
-
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("ModDate");
-                return TRUE;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 CFX_WideString csmodDate;
                 vp >> csmodDate;
                 pDictionary->SetAtString("ModDate", PDF_EncodeText(csmodDate));
                 m_pDocument->SetChangeMark();
-                return TRUE;
         }
+    return TRUE;
 }
 
 FX_BOOL Document::producer(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
-
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Producer");
-                return TRUE;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 CFX_WideString csproducer;
                 vp >> csproducer;
                 pDictionary->SetAtString("Producer", PDF_EncodeText(csproducer));
                 m_pDocument->SetChangeMark();
-                return TRUE;
         }
+    return TRUE;
 }
 
 FX_BOOL Document::subject(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
-
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Subject");
-                return TRUE;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 CFX_WideString cssubject;
                 vp >> cssubject;
                 pDictionary->SetAtString("Subject", PDF_EncodeText(cssubject));
                 m_pDocument->SetChangeMark();
-                return TRUE;
         }
+    return TRUE;
 }
 
 FX_BOOL Document::title(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
-
         if (m_pDocument == NULL || m_pDocument->GetDocument() == NULL)
                 return FALSE;
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)
+        return FALSE;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Title");
-                return TRUE;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY))
+            return FALSE;
 
                 CFX_WideString cstitle;
                 vp >> cstitle;
                 pDictionary->SetAtString("Title", PDF_EncodeText(cstitle));
                 m_pDocument->SetChangeMark();
-                return TRUE;
         }
+    return TRUE;
 }
 
 FX_BOOL Document::numPages(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting()) {
                 CJS_Context* pContext = static_cast<CJS_Context*>(cc);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
                 return FALSE;
         }
         vp << m_pDocument->GetPageCount();
@@ skipping 203 matching lines @@
         return TRUE;
 }
 
 FX_BOOL Document::getLinks(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         return TRUE;
 }
 
 bool Document::IsEnclosedInRect(CFX_FloatRect rect, CFX_FloatRect LinkRect)
 {
-        if (rect.left <= LinkRect.left
-          && rect.top <= LinkRect.top
-          && rect.right >= LinkRect.right
-          && rect.bottom >= LinkRect.bottom)
-                return true;
-        else
-                return false;
+        return (rect.left <= LinkRect.left &&
+            rect.top <= LinkRect.top &&
+            rect.right >= LinkRect.right &&
+            rect.bottom >= LinkRect.bottom);
 }
 
 void IconTree::InsertIconElement(IconElement* pNewIcon)
 {
         if (!pNewIcon)return;
 
         if (m_pHead == NULL && m_pEnd == NULL)
         {
                 m_pHead = m_pEnd = pNewIcon;
                 m_iLength++;
@@ skipping 32 matching lines @@
 {
         if (iIndex >= 0 && iIndex <= m_iLength)
         {
                 IconElement* pTemp = m_pHead;
                 for (int i = 0; i < iIndex; i++)
                 {
                         pTemp = pTemp->NextIcon;
                 }
                 return pTemp;
         }
-        else
-                return NULL;
+    return NULL;
 }
 
 FX_BOOL Document::addIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         if (params.size() != 2) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
@@ skipping 452 matching lines @@
         {
                 m_DelayData.RemoveAt(DelArray[j]);
         }
 }
 
 CJS_Document* Document::GetCJSDoc() const
 {
         return static_cast<CJS_Document*>(m_pJSObject);
 }