diff options
Diffstat (limited to 'xfa/fxfa/parser/cxfa_document.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 6860c83376..9e5143c5a4 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -1447,17 +1447,19 @@ CFXJSE_Engine* CXFA_Document::GetScriptContext() const { XFA_VERSION CXFA_Document::RecognizeXFAVersionNumber( const WideString& wsTemplateNS) { WideStringView wsTemplateURIPrefix(kTemplateNS); - size_t nPrefixLength = wsTemplateURIPrefix.GetLength(); - if (WideStringView(wsTemplateNS.c_str(), wsTemplateNS.GetLength()) != - wsTemplateURIPrefix) { + if (wsTemplateNS.GetLength() <= wsTemplateURIPrefix.GetLength()) return XFA_VERSION_UNKNOWN; - } - auto nDotPos = wsTemplateNS.Find('.', nPrefixLength); + + size_t prefixLength = wsTemplateURIPrefix.GetLength(); + if (WideStringView(wsTemplateNS.c_str(), prefixLength) != wsTemplateURIPrefix) + return XFA_VERSION_UNKNOWN; + + auto nDotPos = wsTemplateNS.Find('.', prefixLength); if (!nDotPos.has_value()) return XFA_VERSION_UNKNOWN; int8_t iMajor = FXSYS_wtoi( - wsTemplateNS.Mid(nPrefixLength, nDotPos.value() - nPrefixLength).c_str()); + wsTemplateNS.Mid(prefixLength, nDotPos.value() - prefixLength).c_str()); int8_t iMinor = FXSYS_wtoi(wsTemplateNS .Mid(nDotPos.value() + 1, |