Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv23118 Modified Files: compile.c Log Message: Fix SF bug [ 808594 ] leak on lambda with duplicate arguments error. Refactor code so that one helper routine sets error location and increments st_errors. Bug fix candidate. Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.294 retrieving revision 2.295 diff -C2 -d -r2.294 -r2.295 *** compile.c 16 Sep 2003 04:27:52 -0000 2.294 --- compile.c 22 Sep 2003 04:26:44 -0000 2.295 *************** *** 4779,4782 **** --- 4779,4792 ---- static int + symtable_error(struct symtable *st, int lineno) + { + if (lineno == 0) + lineno = st->st_cur->ste_lineno; + PyErr_SyntaxLocation(st->st_filename, lineno); + st->st_errors++; + return -1; + } + + static int symtable_load_symbols(struct compiling *c) { *************** *** 4836,4842 **** PyErr_Format(PyExc_SyntaxError, LOCAL_GLOBAL, PyString_AS_STRING(name)); ! PyErr_SyntaxLocation(st->st_filename, ! ste->ste_lineno); ! st->st_errors++; goto fail; } --- 4846,4850 ---- PyErr_Format(PyExc_SyntaxError, LOCAL_GLOBAL, PyString_AS_STRING(name)); ! symtable_error(st, 0); goto fail; } *************** *** 5191,5197 **** PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT, PyString_AsString(name)); ! PyErr_SyntaxLocation(st->st_filename, ! st->st_cur->ste_lineno); ! return -1; } val |= flag; --- 5199,5203 ---- PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT, PyString_AsString(name)); ! return symtable_error(st, 0); } val |= flag; *************** *** 5590,5596 **** "name '%.400s' is local and global", name); ! PyErr_SyntaxLocation(st->st_filename, ! st->st_cur->ste_lineno); ! st->st_errors++; return; } --- 5596,5600 ---- "name '%.400s' is local and global", name); ! symtable_error(st, 0); return; } *************** *** 5652,5658 **** PyErr_SetString(PyExc_SyntaxError, LATE_FUTURE); ! PyErr_SyntaxLocation(st->st_filename, ! n->n_lineno); ! st->st_errors++; return; } --- 5656,5660 ---- PyErr_SetString(PyExc_SyntaxError, LATE_FUTURE); ! symtable_error(st, n->n_lineno); return; } *************** *** 5748,5754 **** PyErr_SetString(PyExc_SyntaxError, ASSIGN_DEBUG); ! PyErr_SyntaxLocation(st->st_filename, ! n->n_lineno); ! st->st_errors++; } symtable_add_def(st, STR(tmp), DEF_LOCAL | def_flag); --- 5750,5755 ---- PyErr_SetString(PyExc_SyntaxError, ASSIGN_DEBUG); ! symtable_error(st, n->n_lineno); ! return; } symtable_add_def(st, STR(tmp), DEF_LOCAL | def_flag);