diff options
author | Brett Cannon <bcannon@gmail.com> | 2009-04-02 03:41:46 (GMT) |
---|---|---|
committer | Brett Cannon <bcannon@gmail.com> | 2009-04-02 03:41:46 (GMT) |
commit | a826f32054710f7dc602573f99c6c87a725adbba (patch) | |
tree | 8c3de05b40281fd0453f64f1a816b2d9e47fdb75 /Python | |
parent | 3e2ea79bdaa6be1337b34f8da03f8c42dfe43d2f (diff) | |
download | cpython-a826f32054710f7dc602573f99c6c87a725adbba.zip cpython-a826f32054710f7dc602573f99c6c87a725adbba.tar.gz cpython-a826f32054710f7dc602573f99c6c87a725adbba.tar.bz2 |
Merged revisions 71031 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71031 | brett.cannon | 2009-04-01 20:17:39 -0700 (Wed, 01 Apr 2009) | 6 lines
PyImport_AppendInittab() took a char * as a first argument even though that
string was stored beyond the life of the call. Changed the signature to be
const char * to help make this point.
Closes issue #1419652.
........
Diffstat (limited to 'Python')
-rw-r--r-- | Python/import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/import.c b/Python/import.c index 3a3c9f2..bccb971 100644 --- a/Python/import.c +++ b/Python/import.c @@ -3488,13 +3488,13 @@ PyImport_ExtendInittab(struct _inittab *newtab) /* Shorthand to add a single entry given a name and a function */ int -PyImport_AppendInittab(char *name, PyObject* (*initfunc)(void)) +PyImport_AppendInittab(const char *name, PyObject* (*initfunc)(void)) { struct _inittab newtab[2]; memset(newtab, '\0', sizeof newtab); - newtab[0].name = name; + newtab[0].name = (char *)name; newtab[0].initfunc = initfunc; return PyImport_ExtendInittab(newtab); |