In raw_input(prompt), make sure that str(prompt) really a string

object before using it.

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 3aba792d0088a762105678cd63c5f1ae10c657cd..c894ec57155f647433504ebc8254e140cf2d2857 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1191,6 +1191,8 @@ builtin_raw_input(self, args)
                        if (po == NULL)
                                return NULL;
                        prompt = PyString_AsString(po);
+                       if (prompt == NULL)
+                               return NULL;
                }
                else {
                        po = NULL;