From 7793b9e0748c3fb24db42f3d4d6658561e58349e Mon Sep 17 00:00:00 2001
From: rcritten <>
Date: Thu, 3 Jan 2008 21:35:28 +0000
Subject: Resolves BZ 248722

See if the certificate has a version before trying to decode it into a
CGI variable.
---
 nss_engine_vars.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nss_engine_vars.c b/nss_engine_vars.c
index 1439a8b..b3dcf92 100644
--- a/nss_engine_vars.c
+++ b/nss_engine_vars.c
@@ -336,8 +336,13 @@ static char *nss_var_lookup_nss_cert(apr_pool_t *p, CERTCertificate *xs, char *v
     resdup = TRUE;
 
     if (strcEQ(var, "M_VERSION")) {
-        result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->version)+1);
-        resdup = FALSE;
+        if (xs->version.data != NULL) {
+            result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->version)+1);
+            resdup = FALSE;
+        } else {
+            result = apr_pstrdup(p, "UNKNOWN");
+            resdup = FALSE;
+        }
     }
     else if (strcEQ(var, "M_SERIAL")) {
         result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->serialNumber));
-- 
cgit