From 28f97ff783c16f3391384ce97b765ce4eb310ac7 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 4 Apr 2016 16:41:35 -0700 Subject: Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC. Having this happen implicitly can be dangerous because the lifetime has to be considered; we should have caught the "red bots" in https://codereview.chromium.org/1847333004/#ps60001 at compile time. Review URL: https://codereview.chromium.org/1853233002 --- fpdfsdk/fsdk_baseannot.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/fsdk_baseannot.cpp') diff --git a/fpdfsdk/fsdk_baseannot.cpp b/fpdfsdk/fsdk_baseannot.cpp index 07a47cdff9..249fd83fc8 100644 --- a/fpdfsdk/fsdk_baseannot.cpp +++ b/fpdfsdk/fsdk_baseannot.cpp @@ -831,24 +831,22 @@ void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType, if (sAPState.IsEmpty()) { pParentDict = pAPDict; - pStream = pAPDict->GetStreamBy(sAPType); + pStream = pAPDict->GetStreamBy(sAPType.AsByteStringC()); } else { - CPDF_Dictionary* pAPTypeDict = pAPDict->GetDictBy(sAPType); + CPDF_Dictionary* pAPTypeDict = pAPDict->GetDictBy(sAPType.AsByteStringC()); if (!pAPTypeDict) { pAPTypeDict = new CPDF_Dictionary; - pAPDict->SetAt(sAPType, pAPTypeDict); + pAPDict->SetAt(sAPType.AsByteStringC(), pAPTypeDict); } - pParentDict = pAPTypeDict; - pStream = pAPTypeDict->GetStreamBy(sAPState); + pStream = pAPTypeDict->GetStreamBy(sAPState.AsByteStringC()); } if (!pStream) { pStream = new CPDF_Stream(nullptr, 0, nullptr); - CPDF_Document* pDoc = m_pPageView->GetPDFDocument(); int32_t objnum = pDoc->AddIndirectObject(pStream); - pParentDict->SetAtReference(sAPType, pDoc, objnum); + pParentDict->SetAtReference(sAPType.AsByteStringC(), pDoc, objnum); } CPDF_Dictionary* pStreamDict = pStream->GetDict(); -- cgit v1.2.3