SF bug 485175: buffer overflow in traceback.c.
Bugfix candidate.
tb_displayline(): the sprintf format was choking off the file name, but
used plain %s for the function name (which can be arbitrarily long).
Limit both to 500 chars max.
diff --git a/Misc/ACKS b/Misc/ACKS
index 1975ced..0e9e07f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -274,6 +274,7 @@
Ken Manheimer
Vladimir Marangozov
Doug Marien
+Alex Martelli
Anthony Martin
Roger Masse
Nick Mathewson
diff --git a/Python/traceback.c b/Python/traceback.c
index 7bbf852..6abde64 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -144,16 +144,16 @@
{
int err = 0;
FILE *xfp;
- char linebuf[1000];
+ char linebuf[2000];
int i;
if (filename == NULL || name == NULL)
return -1;
#ifdef MPW
/* This is needed by MPW's File and Line commands */
-#define FMT " File \"%.900s\"; line %d # in %s\n"
+#define FMT " File \"%.500s\"; line %d # in %.500s\n"
#else
/* This is needed by Emacs' compile command */
-#define FMT " File \"%.900s\", line %d, in %s\n"
+#define FMT " File \"%.500s\", line %d, in %.500s\n"
#endif
xfp = fopen(filename, "r");
if (xfp == NULL) {