vcl/unx/generic/printer/ppdparser.cxx | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 3288d88e0c0842a44aa959e41cc665b9cf3804b9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 28 12:23:38 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 28 15:09:42 2018 +0100
Resolves: tdf#112215 null deref on missing optional ppd value
Change-Id: Iba45437332df963e1aa213c587071ab293f36390
Reviewed-on: https://gerrit.libreoffice.org/64163
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 105a350a27d6..7789459c200c 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -848,13 +848,22 @@ PPDParser::PPDParser( const OUString& rFile ) :
}
// fill in direct values
- if( (pKey = getKey( OUString( "ColorDevice" ) )) )
- m_bColorDevice = pKey->getValue( 0
)->m_aValue.startsWithIgnoreAsciiCase( "true" );
+ if ((pKey = getKey(OUString("ColorDevice"))))
+ {
+ if (const PPDValue* pValue = pKey->getValue(0))
+ m_bColorDevice =
pValue->m_aValue.startsWithIgnoreAsciiCase("true");
+ }
- if( (pKey = getKey( OUString( "LanguageLevel" ) )) )
- m_nLanguageLevel = pKey->getValue( 0 )->m_aValue.toInt32();
- if( (pKey = getKey( OUString( "TTRasterizer" ) )) )
- m_bType42Capable = pKey->getValue( 0
)->m_aValue.equalsIgnoreAsciiCase( "Type42" );
+ if ((pKey = getKey(OUString("LanguageLevel"))))
+ {
+ if (const PPDValue* pValue = pKey->getValue(0))
+ m_nLanguageLevel = pValue->m_aValue.toInt32();
+ }
+ if ((pKey = getKey(OUString("TTRasterizer"))))
+ {
+ if (const PPDValue* pValue = pKey->getValue(0))
+ m_bType42Capable = pValue->m_aValue.equalsIgnoreAsciiCase(
"Type42" );
+ }
}
PPDParser::~PPDParser()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
