[Libreoffice-commits] core.git: vcl/unx

Thorsten Behrens thb at documentfoundation.org
Thu Apr 10 10:37:45 PDT 2014


 vcl/unx/generic/printer/ppdparser.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 23648e824fe41addb75a024374085bbc831b5d1b
Author: Thorsten Behrens <thb at documentfoundation.org>
Date:   Thu Apr 10 19:35:15 2014 +0200

    Fix crash in ppd parser.
    
    Only access pKey after we've set it.
    
    Change-Id: If0be3972c36b3da9d9a456fe3746224372a443dc

diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 201f5e7..5322c98 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -935,8 +935,10 @@ void PPDParser::parse( ::std::list< OString >& rLines )
             OUString aUniKey(OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252));
             keyit = m_aKeys.find( aUniKey );
             if(keyit != m_aKeys.end())
+            {
                 pKey = keyit->second;
-            pKey->insertValue("Custom", eInvocation, true);
+                pKey->insertValue("Custom", eInvocation, true);
+            }
             continue;
         }
 


More information about the Libreoffice-commits mailing list