traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Objects/mappingobject.c (mappingremove): don't call 

lookmapping() for empty dictionary
This commit is contained in:
Guido van Rossum 1995-01-02 19:42:39 +00:00
parent 3bbc62e9c2
commit efc8713428
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Objects/dictobject.c
View File

@ -322,8 +322,11 @@ mappingremove(op, key)
if (hash == -1) if (hash == -1)
return -1; return -1;
mp = (mappingobject *)op; mp = (mappingobject *)op;
if (((mappingobject *)op)->ma_table == NULL)
goto empty;
ep = lookmapping(mp, key, hash); ep = lookmapping(mp, key, hash);
if (ep->me_value == NULL) { if (ep->me_value == NULL) {
empty:
err_setval(KeyError, key); err_setval(KeyError, key);
return -1; return -1;
} }

3
Objects/mappingobject.c
View File

@ -322,8 +322,11 @@ mappingremove(op, key)
if (hash == -1) if (hash == -1)
return -1; return -1;
mp = (mappingobject *)op; mp = (mappingobject *)op;
if (((mappingobject *)op)->ma_table == NULL)
goto empty;
ep = lookmapping(mp, key, hash); ep = lookmapping(mp, key, hash);
if (ep->me_value == NULL) { if (ep->me_value == NULL) {
empty:
err_setval(KeyError, key); err_setval(KeyError, key);
return -1; return -1;
} }