[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/3163a01ac074
changeset:   85543:3163a01ac074
branch:      2.7
parent:      85542:408165aced01
parent:      85538:a7d5b86ffb95
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Thu Sep 05 17:30:56 2013 +0300
summary:
  Merge heads

files:
  Modules/_ssl.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -691,7 +691,7 @@
 
     int i, j;
     PyObject *peer_alt_names = Py_None;
-    PyObject *v, *t;
+    PyObject *v = NULL, *t;
     X509_EXTENSION *ext = NULL;
     GENERAL_NAMES *names = NULL;
     GENERAL_NAME *name;

-- 
Repository URL: http://hg.python.org/cpython