From b621721cf373bf14a0fbd05d93fc35b50ebe3a98 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 12 Oct 2009 21:52:19 +0000
Subject: [PATCH] avoid crash

---
 panda/src/downloader/httpChannel.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/panda/src/downloader/httpChannel.cxx b/panda/src/downloader/httpChannel.cxx
index d0e68d4838..fad4f5dbf0 100644
--- a/panda/src/downloader/httpChannel.cxx
+++ b/panda/src/downloader/httpChannel.cxx
@@ -3338,10 +3338,14 @@ validate_server_name(X509 *cert) {
       
       if (alt_name->type == GEN_DNS) {
         char *buffer = NULL;
-        ASN1_STRING_to_UTF8((unsigned char**)&buffer,
-                            alt_name->d.ia5);
-        cert_names.push_back(buffer);
-        OPENSSL_free(buffer);
+        int len = ASN1_STRING_to_UTF8((unsigned char**)&buffer,
+                                      alt_name->d.ia5);
+        if (len > 0) {
+          cert_names.push_back(string(buffer, len));
+        }
+        if (buffer != NULL) {
+          OPENSSL_free(buffer);
+        }
       }
     }
   }