summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2017-08-15 13:13:10 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-15 17:25:01 +0000
commit130bf6fc898e9ad42e3f63d90e400172de4fa65e (patch)
treeeb4510ddc46d8361b1a70716f4763b635eb048ac /core
parent3577cfbe59725324b597d2270c94be38d36dab49 (diff)
downloadpdfium-130bf6fc898e9ad42e3f63d90e400172de4fa65e.tar.xz
Add missing length check before getting element from string
BUG=chromium:754993 Change-Id: I9444ef83fb62784fef3bf8d294b2ab88b6574b5a Reviewed-on: https://pdfium-review.googlesource.com/11070 Commit-Queue: Ryan Harrison <rharrison@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fpdfdoc/cpvt_generateap.cpp52
1 files changed, 28 insertions, 24 deletions
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index 9b5a82a055..90d5d94f7f 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -114,7 +114,8 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
BorderStyle nBorderStyle = BorderStyle::SOLID;
float fBorderWidth = 1;
CPVT_Dash dsBorder(3, 0, 0);
- CPVT_Color crLeftTop, crRightBottom;
+ CPVT_Color crLeftTop;
+ CPVT_Color crRightBottom;
if (CPDF_Dictionary* pBSDict = pAnnotDict->GetDictFor("BS")) {
if (pBSDict->KeyExist("W"))
fBorderWidth = pBSDict->GetNumberFor("W");
@@ -123,31 +124,34 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
dsBorder = CPVT_Dash(pArray->GetIntegerAt(0), pArray->GetIntegerAt(1),
pArray->GetIntegerAt(2));
}
- switch (pBSDict->GetStringFor("S")[0]) {
- case 'S':
- nBorderStyle = BorderStyle::SOLID;
- break;
- case 'D':
- nBorderStyle = BorderStyle::DASH;
- break;
- case 'B':
- nBorderStyle = BorderStyle::BEVELED;
- fBorderWidth *= 2;
- crLeftTop = CPVT_Color(CPVT_Color::kGray, 1);
- crRightBottom = CPVT_Color(CPVT_Color::kGray, 0.5);
- break;
- case 'I':
- nBorderStyle = BorderStyle::INSET;
- fBorderWidth *= 2;
- crLeftTop = CPVT_Color(CPVT_Color::kGray, 0.5);
- crRightBottom = CPVT_Color(CPVT_Color::kGray, 0.75);
- break;
- case 'U':
- nBorderStyle = BorderStyle::UNDERLINE;
- break;
+ if (pBSDict->GetStringFor("S").GetLength()) {
+ switch (pBSDict->GetStringFor("S")[0]) {
+ case 'S':
+ nBorderStyle = BorderStyle::SOLID;
+ break;
+ case 'D':
+ nBorderStyle = BorderStyle::DASH;
+ break;
+ case 'B':
+ nBorderStyle = BorderStyle::BEVELED;
+ fBorderWidth *= 2;
+ crLeftTop = CPVT_Color(CPVT_Color::kGray, 1);
+ crRightBottom = CPVT_Color(CPVT_Color::kGray, 0.5);
+ break;
+ case 'I':
+ nBorderStyle = BorderStyle::INSET;
+ fBorderWidth *= 2;
+ crLeftTop = CPVT_Color(CPVT_Color::kGray, 0.5);
+ crRightBottom = CPVT_Color(CPVT_Color::kGray, 0.75);
+ break;
+ case 'U':
+ nBorderStyle = BorderStyle::UNDERLINE;
+ break;
+ }
}
}
- CPVT_Color crBorder, crBG;
+ CPVT_Color crBorder;
+ CPVT_Color crBG;
if (CPDF_Dictionary* pMKDict = pAnnotDict->GetDictFor("MK")) {
if (CPDF_Array* pArray = pMKDict->GetArrayFor("BC"))
crBorder = CPVT_Color::ParseColor(*pArray);