Commit 9aa672e
committed
gh-146613: Fix re-entrant use-after-free in itertools._grouper
The same pattern was fixed in groupby.__next__ (gh-143543 / a91b5c3),
but _grouper_next (the inner group iterator returned by groupby)
was missed.
A user-defined __eq__ can re-enter the grouper during
PyObject_RichCompareBool, causing Py_XSETREF to free currkey
while it is still being used.
Fix by taking local snapshots of tgtkey/currkey + INCREF/DECREF
protection, exactly as done in groupby_next.
Added regression test in test_itertools.py.1 parent 4497cf3 commit 9aa672e
2 files changed
+47
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
754 | 754 | | |
755 | 755 | | |
756 | 756 | | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
757 | 791 | | |
758 | 792 | | |
759 | 793 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
678 | 678 | | |
679 | 679 | | |
680 | 680 | | |
681 | | - | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
682 | 694 | | |
683 | 695 | | |
684 | 696 | | |
| |||
0 commit comments