Issue #21151: Fixed a segfault in the _winreg module.
When ``None`` was passed as a ``REG_BINARY`` value to SetValueEx,
PyMem_DEL was called on an uninitialized buffer. Patch by John Ehresman.
(Also an incidental typo fix in a comment in test_winreg)
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
index 260c224..8e3cdf3 100644
--- a/Lib/test/test_winreg.py
+++ b/Lib/test/test_winreg.py
@@ -341,7 +341,7 @@
def test_queryvalueex_return_value(self):
# Test for Issue #16759, return unsigned int from QueryValueEx.
# Reg2Py, which gets called by QueryValueEx, was returning a value
- # generated by PyLong_FromLong. The implmentation now uses
+ # generated by PyLong_FromLong. The implementation now uses
# PyLong_FromUnsignedLong to match DWORD's size.
try:
with CreateKey(HKEY_CURRENT_USER, test_key_name) as ck:
@@ -354,6 +354,19 @@
finally:
DeleteKey(HKEY_CURRENT_USER, test_key_name)
+ def test_setvalueex_crash_with_none_arg(self):
+ # Test for Issue #21151, segfault when None is passed to SetValueEx
+ try:
+ with CreateKey(HKEY_CURRENT_USER, test_key_name) as ck:
+ self.assertNotEqual(ck.handle, 0)
+ test_val = None
+ SetValueEx(ck, "test_name", 0, REG_BINARY, test_val)
+ ret_val, ret_type = QueryValueEx(ck, "test_name")
+ self.assertEqual(ret_type, REG_BINARY)
+ self.assertEqual(ret_val, test_val)
+ finally:
+ DeleteKey(HKEY_CURRENT_USER, test_key_name)
+
@unittest.skipUnless(REMOTE_NAME, "Skipping remote registry tests")