From 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 22 Jul 2015 15:14:14 -0700 Subject: Re-land else-after-returns Revert "Revert "Fix else-after-returns throughout pdfium."" This reverts commit 4eb4d7f6c707cc2c23c806aa540d055c8832b55d. Fix one naming conflict. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1243953004 . --- fpdfsdk/src/javascript/JS_GlobalData.cpp | 845 +++++++++++++++---------------- 1 file changed, 419 insertions(+), 426 deletions(-) (limited to 'fpdfsdk/src/javascript/JS_GlobalData.cpp') diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index 2ba5c3bca5..8c7bd7150e 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -9,7 +9,7 @@ #include "../../include/javascript/IJavaScript.h" #include "../../include/javascript/JS_GlobalData.h" -#define JS_MAXGLOBALDATA (1024 * 4 - 8) +#define JS_MAXGLOBALDATA (1024 * 4 - 8) /* --------------------- CJS_GlobalVariableArray --------------------- */ @@ -19,497 +19,495 @@ CJS_GlobalVariableArray::CJS_GlobalVariableArray() CJS_GlobalVariableArray::~CJS_GlobalVariableArray() { - Empty(); + Empty(); } void CJS_GlobalVariableArray::Copy(const CJS_GlobalVariableArray& array) { - Empty(); - for (int i=0,sz=array.Count(); inType) - { - case JS_GLOBALDATA_TYPE_NUMBER: - { - CJS_KeyValue* pNewObjData = new CJS_KeyValue; - pNewObjData->sKey = pOldObjData->sKey; - pNewObjData->nType = pOldObjData->nType; - pNewObjData->dData = pOldObjData->dData; - Add(pNewObjData); - } - break; - case JS_GLOBALDATA_TYPE_BOOLEAN: - { - CJS_KeyValue* pNewObjData = new CJS_KeyValue; - pNewObjData->sKey = pOldObjData->sKey; - pNewObjData->nType = pOldObjData->nType; - pNewObjData->bData = pOldObjData->bData; - Add(pNewObjData); - } - break; - case JS_GLOBALDATA_TYPE_STRING: - { - CJS_KeyValue* pNewObjData = new CJS_KeyValue; - pNewObjData->sKey = pOldObjData->sKey; - pNewObjData->nType = pOldObjData->nType; - pNewObjData->sData = pOldObjData->sData; - Add(pNewObjData); - } - break; - case JS_GLOBALDATA_TYPE_OBJECT: - { - CJS_KeyValue* pNewObjData = new CJS_KeyValue; - pNewObjData->sKey = pOldObjData->sKey; - pNewObjData->nType = pOldObjData->nType; - pNewObjData->objData.Copy(pOldObjData->objData); - Add(pNewObjData); - } - case JS_GLOBALDATA_TYPE_NULL: - { - CJS_KeyValue* pNewObjData = new CJS_KeyValue; - pNewObjData->sKey = pOldObjData->sKey; - pNewObjData->nType = pOldObjData->nType; - Add(pNewObjData); - } - } - } + Empty(); + for (int i=0,sz=array.Count(); inType) + { + case JS_GLOBALDATA_TYPE_NUMBER: + { + CJS_KeyValue* pNewObjData = new CJS_KeyValue; + pNewObjData->sKey = pOldObjData->sKey; + pNewObjData->nType = pOldObjData->nType; + pNewObjData->dData = pOldObjData->dData; + Add(pNewObjData); + } + break; + case JS_GLOBALDATA_TYPE_BOOLEAN: + { + CJS_KeyValue* pNewObjData = new CJS_KeyValue; + pNewObjData->sKey = pOldObjData->sKey; + pNewObjData->nType = pOldObjData->nType; + pNewObjData->bData = pOldObjData->bData; + Add(pNewObjData); + } + break; + case JS_GLOBALDATA_TYPE_STRING: + { + CJS_KeyValue* pNewObjData = new CJS_KeyValue; + pNewObjData->sKey = pOldObjData->sKey; + pNewObjData->nType = pOldObjData->nType; + pNewObjData->sData = pOldObjData->sData; + Add(pNewObjData); + } + break; + case JS_GLOBALDATA_TYPE_OBJECT: + { + CJS_KeyValue* pNewObjData = new CJS_KeyValue; + pNewObjData->sKey = pOldObjData->sKey; + pNewObjData->nType = pOldObjData->nType; + pNewObjData->objData.Copy(pOldObjData->objData); + Add(pNewObjData); + } + case JS_GLOBALDATA_TYPE_NULL: + { + CJS_KeyValue* pNewObjData = new CJS_KeyValue; + pNewObjData->sKey = pOldObjData->sKey; + pNewObjData->nType = pOldObjData->nType; + Add(pNewObjData); + } + } + } } void CJS_GlobalVariableArray::Add(CJS_KeyValue* p) { - array.Add(p); + array.Add(p); } int CJS_GlobalVariableArray::Count() const { - return array.GetSize(); + return array.GetSize(); } CJS_KeyValue* CJS_GlobalVariableArray::GetAt(int index) const { - return array.GetAt(index); + return array.GetAt(index); } void CJS_GlobalVariableArray::Empty() { - for (int i=0,sz=array.GetSize(); iGetUserPath(); - m_sFilePath += SDK_JS_GLOBALDATA_FILENAME; +// m_sFilePath = pBaseAnnot->GetUserPath(); + m_sFilePath += SDK_JS_GLOBALDATA_FILENAME; - LoadGlobalPersistentVariables(); + LoadGlobalPersistentVariables(); } CJS_GlobalData::~CJS_GlobalData() { - SaveGlobalPersisitentVariables(); + SaveGlobalPersisitentVariables(); - for (int i=0,sz=m_arrayGlobalData.GetSize(); idata.sKey[0] == *propname && pTemp->data.sKey == propname) - { - nRet = i; - break; - } - } + for (int i=0,sz=m_arrayGlobalData.GetSize(); idata.sKey[0] == *propname && pTemp->data.sKey == propname) + { + nRet = i; + break; + } + } - return nRet; + return nRet; } CJS_GlobalData_Element* CJS_GlobalData::GetGlobalVariable(const FX_CHAR* propname) { - ASSERT(propname != NULL); + ASSERT(propname != NULL); - int nFind = FindGlobalVariable(propname); + int nFind = FindGlobalVariable(propname); + if (nFind >= 0) + return m_arrayGlobalData.GetAt(nFind); - if (nFind >= 0) - return m_arrayGlobalData.GetAt(nFind); - else - return NULL; + return NULL; } void CJS_GlobalData::SetGlobalVariableNumber(const FX_CHAR* propname, double dData) { - ASSERT(propname != NULL); - CFX_ByteString sPropName = propname; - - sPropName.TrimLeft(); - sPropName.TrimRight(); - - if (sPropName.GetLength() == 0) return; - - if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) - { - pData->data.nType = JS_GLOBALDATA_TYPE_NUMBER; - pData->data.dData = dData; - } - else - { - CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; - pNewData->data.sKey = sPropName; - pNewData->data.nType = JS_GLOBALDATA_TYPE_NUMBER; - pNewData->data.dData = dData; - - m_arrayGlobalData.Add(pNewData); - } + ASSERT(propname != NULL); + + CFX_ByteString sPropName = propname; + sPropName.TrimLeft(); + sPropName.TrimRight(); + if (sPropName.GetLength() == 0) + return; + + if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) + { + pData->data.nType = JS_GLOBALDATA_TYPE_NUMBER; + pData->data.dData = dData; + } + else + { + CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; + pNewData->data.sKey = sPropName; + pNewData->data.nType = JS_GLOBALDATA_TYPE_NUMBER; + pNewData->data.dData = dData; + m_arrayGlobalData.Add(pNewData); + } } void CJS_GlobalData::SetGlobalVariableBoolean(const FX_CHAR* propname, bool bData) { - ASSERT(propname != NULL); - CFX_ByteString sPropName = propname; - - sPropName.TrimLeft(); - sPropName.TrimRight(); - - if (sPropName.GetLength() == 0) return; - - if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) - { - pData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN; - pData->data.bData = bData; - } - else - { - CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; - pNewData->data.sKey = sPropName; - pNewData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN; - pNewData->data.bData = bData; - - m_arrayGlobalData.Add(pNewData); - } + ASSERT(propname != NULL); + CFX_ByteString sPropName = propname; + + sPropName.TrimLeft(); + sPropName.TrimRight(); + + if (sPropName.GetLength() == 0) return; + + if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) + { + pData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN; + pData->data.bData = bData; + } + else + { + CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; + pNewData->data.sKey = sPropName; + pNewData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN; + pNewData->data.bData = bData; + + m_arrayGlobalData.Add(pNewData); + } } void CJS_GlobalData::SetGlobalVariableString(const FX_CHAR* propname, const CFX_ByteString& sData) { - ASSERT(propname != NULL); - CFX_ByteString sPropName = propname; - - sPropName.TrimLeft(); - sPropName.TrimRight(); - - if (sPropName.GetLength() == 0) return; - - if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) - { - pData->data.nType = JS_GLOBALDATA_TYPE_STRING; - pData->data.sData = sData; - } - else - { - CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; - pNewData->data.sKey = sPropName; - pNewData->data.nType = JS_GLOBALDATA_TYPE_STRING; - pNewData->data.sData = sData; - - m_arrayGlobalData.Add(pNewData); - } + ASSERT(propname != NULL); + CFX_ByteString sPropName = propname; + + sPropName.TrimLeft(); + sPropName.TrimRight(); + + if (sPropName.GetLength() == 0) return; + + if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) + { + pData->data.nType = JS_GLOBALDATA_TYPE_STRING; + pData->data.sData = sData; + } + else + { + CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; + pNewData->data.sKey = sPropName; + pNewData->data.nType = JS_GLOBALDATA_TYPE_STRING; + pNewData->data.sData = sData; + + m_arrayGlobalData.Add(pNewData); + } } void CJS_GlobalData::SetGlobalVariableObject(const FX_CHAR* propname, const CJS_GlobalVariableArray& array) { - ASSERT(propname != NULL); - CFX_ByteString sPropName = propname; - - sPropName.TrimLeft(); - sPropName.TrimRight(); - - if (sPropName.GetLength() == 0) return; - - if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) - { - pData->data.nType = JS_GLOBALDATA_TYPE_OBJECT; - pData->data.objData.Copy(array); - } - else - { - CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; - pNewData->data.sKey = sPropName; - pNewData->data.nType = JS_GLOBALDATA_TYPE_OBJECT; - pNewData->data.objData.Copy(array); - - m_arrayGlobalData.Add(pNewData); - } + ASSERT(propname != NULL); + CFX_ByteString sPropName = propname; + + sPropName.TrimLeft(); + sPropName.TrimRight(); + + if (sPropName.GetLength() == 0) return; + + if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) + { + pData->data.nType = JS_GLOBALDATA_TYPE_OBJECT; + pData->data.objData.Copy(array); + } + else + { + CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; + pNewData->data.sKey = sPropName; + pNewData->data.nType = JS_GLOBALDATA_TYPE_OBJECT; + pNewData->data.objData.Copy(array); + + m_arrayGlobalData.Add(pNewData); + } } void CJS_GlobalData::SetGlobalVariableNull(const FX_CHAR* propname) { - ASSERT(propname != NULL); - CFX_ByteString sPropName = propname; - - sPropName.TrimLeft(); - sPropName.TrimRight(); - - if (sPropName.GetLength() == 0) return; - - if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) - { - pData->data.nType = JS_GLOBALDATA_TYPE_NULL; - } - else - { - CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; - pNewData->data.sKey = sPropName; - pNewData->data.nType = JS_GLOBALDATA_TYPE_NULL; - - m_arrayGlobalData.Add(pNewData); - } + ASSERT(propname != NULL); + CFX_ByteString sPropName = propname; + + sPropName.TrimLeft(); + sPropName.TrimRight(); + + if (sPropName.GetLength() == 0) return; + + if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) + { + pData->data.nType = JS_GLOBALDATA_TYPE_NULL; + } + else + { + CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element; + pNewData->data.sKey = sPropName; + pNewData->data.nType = JS_GLOBALDATA_TYPE_NULL; + + m_arrayGlobalData.Add(pNewData); + } } FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname, FX_BOOL bPersistent) { - ASSERT(propname != NULL); - CFX_ByteString sPropName = propname; + ASSERT(propname != NULL); + CFX_ByteString sPropName = propname; - sPropName.TrimLeft(); - sPropName.TrimRight(); + sPropName.TrimLeft(); + sPropName.TrimRight(); - if (sPropName.GetLength() == 0) return FALSE; + if (sPropName.GetLength() == 0) return FALSE; - if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) - { - pData->bPersistent = bPersistent; - return TRUE; - } + if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) + { + pData->bPersistent = bPersistent; + return TRUE; + } - return FALSE; + return FALSE; } FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname) { - ASSERT(propname != NULL); - CFX_ByteString sPropName = propname; + ASSERT(propname != NULL); + CFX_ByteString sPropName = propname; - sPropName.TrimLeft(); - sPropName.TrimRight(); + sPropName.TrimLeft(); + sPropName.TrimRight(); - if (sPropName.GetLength() == 0) return FALSE; + if (sPropName.GetLength() == 0) return FALSE; - int nFind = FindGlobalVariable(sPropName); + int nFind = FindGlobalVariable(sPropName); - if (nFind >= 0) - { - delete m_arrayGlobalData.GetAt(nFind); - m_arrayGlobalData.RemoveAt(nFind); - return TRUE; - } + if (nFind >= 0) + { + delete m_arrayGlobalData.GetAt(nFind); + m_arrayGlobalData.RemoveAt(nFind); + return TRUE; + } - return FALSE; + return FALSE; } int32_t CJS_GlobalData::GetSize() const { - return m_arrayGlobalData.GetSize(); + return m_arrayGlobalData.GetSize(); } CJS_GlobalData_Element* CJS_GlobalData::GetAt(int index) const { - return m_arrayGlobalData.GetAt(index); + return m_arrayGlobalData.GetAt(index); } void CJS_GlobalData::LoadGlobalPersistentVariables() { - uint8_t* pBuffer = NULL; - int32_t nLength = 0; - - LoadFileBuffer(m_sFilePath.c_str(), pBuffer, nLength); - CRYPT_ArcFourCryptBlock(pBuffer, nLength, JS_RC4KEY, sizeof(JS_RC4KEY)); - - if (pBuffer) - { - uint8_t* p = pBuffer; - FX_WORD wType = *((FX_WORD*)p); - p += sizeof(FX_WORD); - - //FX_WORD wTemp = (FX_WORD)(('X' << 8) | 'F'); - - if (wType == (FX_WORD)(('X' << 8) | 'F')) - { - FX_WORD wVersion = *((FX_WORD*)p); - p += sizeof(FX_WORD); - - ASSERT(wVersion <= 2); - - FX_DWORD dwCount = *((FX_DWORD*)p); - p += sizeof(FX_DWORD); - - FX_DWORD dwSize = *((FX_DWORD*)p); - p += sizeof(FX_DWORD); - - if (dwSize == nLength - sizeof(FX_WORD) * 2 - sizeof(FX_DWORD)* 2) - { - for (int32_t i=0,sz=dwCount; i pBuffer + nLength) - break; - - FX_DWORD dwNameLen = *((FX_DWORD*)p); - p += sizeof(FX_DWORD); - - if (p + dwNameLen > pBuffer + nLength) - break; - - CFX_ByteString sEntry = CFX_ByteString(p, dwNameLen); - p += sizeof(char) * dwNameLen; - - FX_WORD wDataType = *((FX_WORD*)p); - p += sizeof(FX_WORD); - - switch (wDataType) - { - case JS_GLOBALDATA_TYPE_NUMBER: - { - double dData = 0; - switch (wVersion) - { - case 1: - { - FX_DWORD dwData = *((FX_DWORD*)p); - p += sizeof(FX_DWORD); - dData = dwData; - } - break; - case 2: - { - dData = *((double*)p); - p += sizeof(double); - } - break; - } - SetGlobalVariableNumber(sEntry, dData); - SetGlobalVariablePersistent(sEntry, TRUE); - } - break; - case JS_GLOBALDATA_TYPE_BOOLEAN: - { - FX_WORD wData = *((FX_WORD*)p); - p += sizeof(FX_WORD); - SetGlobalVariableBoolean(sEntry, (bool)(wData == 1)); - SetGlobalVariablePersistent(sEntry, TRUE); - } - break; - case JS_GLOBALDATA_TYPE_STRING: - { - FX_DWORD dwLength = *((FX_DWORD*)p); - p += sizeof(FX_DWORD); - - if (p + dwLength > pBuffer + nLength) - break; - - SetGlobalVariableString(sEntry, CFX_ByteString(p, dwLength)); - SetGlobalVariablePersistent(sEntry, TRUE); - p += sizeof(char) * dwLength; - } - break; - case JS_GLOBALDATA_TYPE_NULL: - { - SetGlobalVariableNull(sEntry); - SetGlobalVariablePersistent(sEntry, TRUE); - } - } - } - } - } - FX_Free(pBuffer); - } + uint8_t* pBuffer = NULL; + int32_t nLength = 0; + + LoadFileBuffer(m_sFilePath.c_str(), pBuffer, nLength); + CRYPT_ArcFourCryptBlock(pBuffer, nLength, JS_RC4KEY, sizeof(JS_RC4KEY)); + + if (pBuffer) + { + uint8_t* p = pBuffer; + FX_WORD wType = *((FX_WORD*)p); + p += sizeof(FX_WORD); + + //FX_WORD wTemp = (FX_WORD)(('X' << 8) | 'F'); + + if (wType == (FX_WORD)(('X' << 8) | 'F')) + { + FX_WORD wVersion = *((FX_WORD*)p); + p += sizeof(FX_WORD); + + ASSERT(wVersion <= 2); + + FX_DWORD dwCount = *((FX_DWORD*)p); + p += sizeof(FX_DWORD); + + FX_DWORD dwSize = *((FX_DWORD*)p); + p += sizeof(FX_DWORD); + + if (dwSize == nLength - sizeof(FX_WORD) * 2 - sizeof(FX_DWORD)* 2) + { + for (int32_t i=0,sz=dwCount; i pBuffer + nLength) + break; + + FX_DWORD dwNameLen = *((FX_DWORD*)p); + p += sizeof(FX_DWORD); + + if (p + dwNameLen > pBuffer + nLength) + break; + + CFX_ByteString sEntry = CFX_ByteString(p, dwNameLen); + p += sizeof(char) * dwNameLen; + + FX_WORD wDataType = *((FX_WORD*)p); + p += sizeof(FX_WORD); + + switch (wDataType) + { + case JS_GLOBALDATA_TYPE_NUMBER: + { + double dData = 0; + switch (wVersion) + { + case 1: + { + FX_DWORD dwData = *((FX_DWORD*)p); + p += sizeof(FX_DWORD); + dData = dwData; + } + break; + case 2: + { + dData = *((double*)p); + p += sizeof(double); + } + break; + } + SetGlobalVariableNumber(sEntry, dData); + SetGlobalVariablePersistent(sEntry, TRUE); + } + break; + case JS_GLOBALDATA_TYPE_BOOLEAN: + { + FX_WORD wData = *((FX_WORD*)p); + p += sizeof(FX_WORD); + SetGlobalVariableBoolean(sEntry, (bool)(wData == 1)); + SetGlobalVariablePersistent(sEntry, TRUE); + } + break; + case JS_GLOBALDATA_TYPE_STRING: + { + FX_DWORD dwLength = *((FX_DWORD*)p); + p += sizeof(FX_DWORD); + + if (p + dwLength > pBuffer + nLength) + break; + + SetGlobalVariableString(sEntry, CFX_ByteString(p, dwLength)); + SetGlobalVariablePersistent(sEntry, TRUE); + p += sizeof(char) * dwLength; + } + break; + case JS_GLOBALDATA_TYPE_NULL: + { + SetGlobalVariableNull(sEntry); + SetGlobalVariablePersistent(sEntry, TRUE); + } + } + } + } + } + FX_Free(pBuffer); + } } /* struct js_global_datafile_header { - FX_WORD type; //FX ('X' << 8) | 'F' - FX_WORD version; //1.0 - FX_DWORD datacount; + FX_WORD type; //FX ('X' << 8) | 'F' + FX_WORD version; //1.0 + FX_DWORD datacount; }; struct js_global_datafile_data { - FX_WORD type; - FX_DWORD nData; - FX_WORD bData; - FX_DWORD nStrLen; - char* pStr; + FX_WORD type; + FX_DWORD nData; + FX_WORD bData; + FX_DWORD nStrLen; + char* pStr; }; */ void CJS_GlobalData::SaveGlobalPersisitentVariables() { - FX_DWORD nCount = 0; - CFX_BinaryBuf sData; + FX_DWORD nCount = 0; + CFX_BinaryBuf sData; - for (int i=0,sz=m_arrayGlobalData.GetSize(); ibPersistent) - { - CFX_BinaryBuf sElement; - MakeByteString(pElement->data.sKey, &pElement->data, sElement); + if (pElement->bPersistent) + { + CFX_BinaryBuf sElement; + MakeByteString(pElement->data.sKey, &pElement->data, sElement); - if (sData.GetSize() + sElement.GetSize() > JS_MAXGLOBALDATA) - break; + if (sData.GetSize() + sElement.GetSize() > JS_MAXGLOBALDATA) + break; - sData.AppendBlock(sElement.GetBuffer(), sElement.GetSize()); - nCount++; - } - } + sData.AppendBlock(sElement.GetBuffer(), sElement.GetSize()); + nCount++; + } + } - CFX_BinaryBuf sFile; + CFX_BinaryBuf sFile; - FX_WORD wType = (FX_WORD)(('X' << 8) | 'F'); - sFile.AppendBlock(&wType, sizeof(FX_WORD)); - FX_WORD wVersion = 2; - sFile.AppendBlock(&wVersion, sizeof(FX_WORD)); - sFile.AppendBlock(&nCount, sizeof(FX_DWORD)); - FX_DWORD dwSize = sData.GetSize(); - sFile.AppendBlock(&dwSize, sizeof(FX_DWORD)); + FX_WORD wType = (FX_WORD)(('X' << 8) | 'F'); + sFile.AppendBlock(&wType, sizeof(FX_WORD)); + FX_WORD wVersion = 2; + sFile.AppendBlock(&wVersion, sizeof(FX_WORD)); + sFile.AppendBlock(&nCount, sizeof(FX_DWORD)); + FX_DWORD dwSize = sData.GetSize(); + sFile.AppendBlock(&dwSize, sizeof(FX_DWORD)); - sFile.AppendBlock(sData.GetBuffer(), sData.GetSize()); + sFile.AppendBlock(sData.GetBuffer(), sData.GetSize()); - CRYPT_ArcFourCryptBlock(sFile.GetBuffer(), sFile.GetSize(), JS_RC4KEY, sizeof(JS_RC4KEY)); - WriteFileBuffer(m_sFilePath.c_str(), (const FX_CHAR*)sFile.GetBuffer(), sFile.GetSize()); + CRYPT_ArcFourCryptBlock(sFile.GetBuffer(), sFile.GetSize(), JS_RC4KEY, sizeof(JS_RC4KEY)); + WriteFileBuffer(m_sFilePath.c_str(), (const FX_CHAR*)sFile.GetBuffer(), sFile.GetSize()); } void CJS_GlobalData::LoadFileBuffer(const FX_WCHAR* sFilePath, uint8_t*& pBuffer, int32_t& nLength) @@ -524,58 +522,53 @@ void CJS_GlobalData::WriteFileBuffer(const FX_WCHAR* sFilePath, const FX_CHAR* p void CJS_GlobalData::MakeByteString(const CFX_ByteString& name, CJS_KeyValue* pData, CFX_BinaryBuf& sData) { - ASSERT(pData != NULL); - - FX_WORD wType = (FX_WORD)pData->nType; - - switch (wType) - { - case JS_GLOBALDATA_TYPE_NUMBER: - { - FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); - sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); - sData.AppendString(name); - - sData.AppendBlock(&wType, sizeof(FX_WORD)); - double dData = pData->dData; - sData.AppendBlock(&dData, sizeof(double)); - } - break; - case JS_GLOBALDATA_TYPE_BOOLEAN: - { - FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); - sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); - sData.AppendString(name); - - sData.AppendBlock(&wType, sizeof(FX_WORD)); - FX_WORD wData = (FX_WORD)pData->bData; - sData.AppendBlock(&wData, sizeof(FX_WORD)); - } - break; - case JS_GLOBALDATA_TYPE_STRING: - { - FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); - sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); - sData.AppendString(name); - - sData.AppendBlock(&wType, sizeof(FX_WORD)); - - FX_DWORD dwDataLen = (FX_DWORD)pData->sData.GetLength(); - sData.AppendBlock(&dwDataLen, sizeof(FX_DWORD)); - sData.AppendString(pData->sData); - } - break; - case JS_GLOBALDATA_TYPE_NULL: - { - FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); - sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); - sData.AppendString(name); - - sData.AppendBlock(&wType, sizeof(FX_DWORD)); - } - break; - default: - break; - } + FX_WORD wType = (FX_WORD)pData->nType; + switch (wType) + { + case JS_GLOBALDATA_TYPE_NUMBER: + { + FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); + sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); + sData.AppendString(name); + sData.AppendBlock(&wType, sizeof(FX_WORD)); + + double dData = pData->dData; + sData.AppendBlock(&dData, sizeof(double)); + } + break; + case JS_GLOBALDATA_TYPE_BOOLEAN: + { + FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); + sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); + sData.AppendString(name); + sData.AppendBlock(&wType, sizeof(FX_WORD)); + + FX_WORD wData = (FX_WORD)pData->bData; + sData.AppendBlock(&wData, sizeof(FX_WORD)); + } + break; + case JS_GLOBALDATA_TYPE_STRING: + { + FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); + sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); + sData.AppendString(name); + sData.AppendBlock(&wType, sizeof(FX_WORD)); + + FX_DWORD dwDataLen = (FX_DWORD)pData->sData.GetLength(); + sData.AppendBlock(&dwDataLen, sizeof(FX_DWORD)); + sData.AppendString(pData->sData); + } + break; + case JS_GLOBALDATA_TYPE_NULL: + { + FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); + sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); + sData.AppendString(name); + sData.AppendBlock(&wType, sizeof(FX_DWORD)); + } + break; + default: + break; + } } -- cgit v1.2.3