| Index: xfa/fde/css/fde_cssdeclaration.cpp
|
| diff --git a/xfa/fde/css/fde_cssdeclaration.cpp b/xfa/fde/css/fde_cssdeclaration.cpp
|
| index 2196d6bd91cf3233469ed22c71565931b52cd37e..f6af9000429ad37a531c16897a50bf0aa9fcb9d2 100644
|
| --- a/xfa/fde/css/fde_cssdeclaration.cpp
|
| +++ b/xfa/fde/css/fde_cssdeclaration.cpp
|
| @@ -301,33 +301,35 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(const FDE_CSSPROPERTYARGS* pArgs,
|
| }
|
| return FXTARGET_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(dwColor);
|
| }
|
| +
|
| IFDE_CSSValue* CFDE_CSSDeclaration::ParseURI(const FDE_CSSPROPERTYARGS* pArgs,
|
| const FX_WCHAR* pszValue,
|
| int32_t iValueLen) {
|
| int32_t iOffset;
|
| - if (!FDE_ParseCSSURI(pszValue, iValueLen, iOffset, iValueLen)) {
|
| + if (!FDE_ParseCSSURI(pszValue, &iOffset, &iValueLen))
|
| return nullptr;
|
| - }
|
| - if (iValueLen <= 0) {
|
| +
|
| + if (iValueLen <= 0)
|
| return nullptr;
|
| - }
|
| +
|
| pszValue = CopyToLocal(pArgs, pszValue + iOffset, iValueLen);
|
| return pszValue
|
| ? FXTARGET_NewWith(pArgs->pStaticStore)
|
| CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE_URI, pszValue)
|
| : nullptr;
|
| }
|
| +
|
| IFDE_CSSValue* CFDE_CSSDeclaration::ParseString(
|
| const FDE_CSSPROPERTYARGS* pArgs,
|
| const FX_WCHAR* pszValue,
|
| int32_t iValueLen) {
|
| int32_t iOffset;
|
| - if (!FDE_ParseCSSString(pszValue, iValueLen, iOffset, iValueLen)) {
|
| + if (!FDE_ParseCSSString(pszValue, iValueLen, &iOffset, &iValueLen))
|
| return nullptr;
|
| - }
|
| - if (iValueLen <= 0) {
|
| +
|
| + if (iValueLen <= 0)
|
| return nullptr;
|
| - }
|
| +
|
| pszValue = CopyToLocal(pArgs, pszValue + iOffset, iValueLen);
|
| return pszValue
|
| ? FXTARGET_NewWith(pArgs->pStaticStore)
|
|
|