summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-04-19 14:11:59 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-19 14:11:59 -0700
commit4d31d0c653cf66f72bdef7cebbf7cff45d33f6c6 (patch)
tree63bd0f15c758b60a5ce577ac1a1f8bb24cb387c8 /xfa/fxfa/parser
parente3bbfa29b9d38dbbb77c12692eba3c40a7fb2870 (diff)
downloadpdfium-4d31d0c653cf66f72bdef7cebbf7cff45d33f6c6.tar.xz
Remove a few more char* members from structs/classes.
This is a result of looking for the anti-paterns /char\*\sm_/ and /m_.*=.*\.c_str/ which indicate that a class may be using the contents of a string without extending the lifetime of the underlying storage. Along the way, change to uint8_t in fx_dib; this is unrelated but avoids grep hits (it is binary, not chars anyways). Also remove two string operators that make it easy to assign in a manner that does not extend contents lifetime. Review URL: https://codereview.chromium.org/1902953002
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/xfa_document_imp.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_object_imp.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp
index bdcfba47cb..39bdf2503c 100644
--- a/xfa/fxfa/parser/xfa_document_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_imp.cpp
@@ -388,7 +388,7 @@ void CXFA_Document::DoProtoMerge() {
!wsUseVal.IsEmpty()) {
FX_STRSIZE uSharpPos = wsUseVal.Find('#');
if (uSharpPos < 0) {
- wsURI = wsUseVal;
+ wsURI = wsUseVal.AsStringC();
} else {
wsURI = CFX_WideStringC(wsUseVal.c_str(), uSharpPos);
FX_STRSIZE uLen = wsUseVal.GetLength();
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 306bd0f173..93b596ae99 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -4084,7 +4084,7 @@ FX_BOOL CXFA_Node::TryCData(XFA_ATTRIBUTE eAttr,
if (eAttr == XFA_ATTRIBUTE_Value) {
CFX_WideString* pStr = (CFX_WideString*)GetUserData(pKey, bProto);
if (pStr) {
- wsValue = *pStr;
+ wsValue = pStr->AsStringC();
return TRUE;
}
} else {