summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-12-10 17:14:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-12-10 21:40:32 +0100
commit605ee3213087b13782bfc0731762c175bc97e53f (patch)
tree3d90762c0d729634982ce61f9c13979d74151624
parentc913406274eb794115e6ce00abf8b01a098d2f37 (diff)
cupsGetPPD returned a nullptr which OString newly aborts with
Change-Id: Ia42e9b501f3e5c769d9d151597e6384836369ed5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107571 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index dbbb26666ba5..7830323d22d7 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -90,7 +90,8 @@ struct GetPPDAttribs
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
- OString aResult = cupsGetPPD(m_aParameter.getStr());
+ const char* pResult = cupsGetPPD(m_aParameter.getStr());
+ OString aResult = pResult ? OString(pResult) : OString();
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif