svn commit: r431636 - in /httpd/mod_python/trunk: Doc/appendixc.tex src/_pspmodule.c

[jg...@apache.org]

Author: jgallacher
Date: Tue Aug 15 09:22:19 2006
New Revision: 431636

URL: http://svn.apache.org/viewvc?rev=431636&view=rev
Log:
Fixed segfault in psp.parsestring(src) where src = "".
(MODPYTHON-185)

Modified:
    httpd/mod_python/trunk/Doc/appendixc.tex
    httpd/mod_python/trunk/src/_pspmodule.c

Modified: httpd/mod_python/trunk/Doc/appendixc.tex
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/Doc/appendixc.tex?rev=431636&r1=431635&r2=431636&view=diff
==============================================================================
--- httpd/mod_python/trunk/Doc/appendixc.tex (original)
+++ httpd/mod_python/trunk/Doc/appendixc.tex Tue Aug 15 09:22:19 2006
@@ -349,6 +349,9 @@
     \item
       (\citetitle[http://issues.apache.org/jira/browse/MODPYTHON-182]{MODPYTHON-182})
       Fixed memory leak in req.readline().
+    \item
+      (\citetitle[http://issues.apache.org/jira/browse/MODPYTHON-185]{MODPYTHON-185})
+      Fixed segfault in psp.parsestring(src_string) when src_string is empty.
   \end{itemize}
 
 

Modified: httpd/mod_python/trunk/src/_pspmodule.c
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/_pspmodule.c?rev=431636&r1=431635&r2=431636&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/_pspmodule.c (original)
+++ httpd/mod_python/trunk/src/_pspmodule.c Tue Aug 15 09:22:19 2006
@@ -152,7 +152,12 @@
     psp_string_0(&parser->pycode);
     Py_END_ALLOW_THREADS
 
-    code = PyString_FromString(parser->pycode.blob);
+    if (parser->pycode.blob) {
+        code = PyString_FromString(parser->pycode.blob);
+    }
+    else {
+        code = PyString_FromString("");
+    }
 
     psp_parser_cleanup(parser);