# HG changeset patch
# User Andre Heinecke <aheinecke@intevation.de>
# Date 1397051399 0
# Node ID 26817025351f5d0391ac65208d188031be000401
# Parent  81a205fc651e104d9b3b3c1f440b74dfba58963c# Parent  811eec4e1b999c810a7b2ce3d62c145c821d5047
merge

diff -r 811eec4e1b99 -r 26817025351f cinst/mozilla.c
--- a/cinst/mozilla.c	Wed Apr 09 12:44:44 2014 +0200
+++ b/cinst/mozilla.c	Wed Apr 09 13:49:59 2014 +0000
@@ -370,6 +370,11 @@
   size_t name_len;
   cn_str = x509_parse_subject(secitemp->data, secitemp->len, CERT_OID_CN);
   o_str = x509_parse_subject(secitemp->data, secitemp->len, CERT_OID_O);
+  if (!cn_str || !o_str)
+    {
+      DEBUGPRINTF("FATAL: Could not parse certificate!");
+      exit(ERR_INVALID_CERT);
+    }
   name_len = strlen(cn_str) + strlen(o_str) + 4;
   name = (char *)xmalloc(name_len);
   snprintf(name, name_len, "%s - %s", cn_str, o_str);
diff -r 811eec4e1b99 -r 26817025351f common/certhelp.c
--- a/common/certhelp.c	Wed Apr 09 12:44:44 2014 +0200
+++ b/common/certhelp.c	Wed Apr 09 13:49:59 2014 +0000
@@ -33,8 +33,8 @@
   x509_crt_init(&chain);
   if (x509_crt_parse_der(&chain, derdata, derlen) != 0)
     {
-      DEBUGPRINTF("FATAL: Could not parse certificate!");
-      exit(ERR_INVALID_CERT);
+      ERRORPRINTF("Could not parse certificate!\n");
+      return NULL;
     }
   else
     {