[Python-checkins] cpython (merge 3.5 -> default): Issue #27932: Fixes memory leak in platform.win32_ver()

Fri Sep 9 21:05:23 EDT 2016

https://hg.python.org/cpython/rev/31b7eaff5588
changeset: 103516:31b7eaff5588
parent: 103513:55d0860f5bb8
parent: 103515:384c178cf823
user: Steve Dower <steve.dower at microsoft.com>
date: Fri Sep 09 18:04:26 2016 -0700
summary:
 Issue #27932: Fixes memory leak in platform.win32_ver()
files:
 Lib/platform.py | 64 +++++++++++++++++++-----------------
 Misc/NEWS | 2 +
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -497,57 +497,61 @@
 (6, None): "post2012ServerR2",
 }
 
+if sys.platform == 'win32':
+ import ctypes
+ import ctypes.wintypes
+
+ class VS_FIXEDFILEINFO(ctypes.Structure):
+ _fields_ = [
+ ("dwSignature", ctypes.wintypes.DWORD),
+ ("dwStrucVersion", ctypes.wintypes.DWORD),
+ ("dwFileVersionMS", ctypes.wintypes.DWORD),
+ ("dwFileVersionLS", ctypes.wintypes.DWORD),
+ ("dwProductVersionMS", ctypes.wintypes.DWORD),
+ ("dwProductVersionLS", ctypes.wintypes.DWORD),
+ ("dwFileFlagsMask", ctypes.wintypes.DWORD),
+ ("dwFileFlags", ctypes.wintypes.DWORD),
+ ("dwFileOS", ctypes.wintypes.DWORD),
+ ("dwFileType", ctypes.wintypes.DWORD),
+ ("dwFileSubtype", ctypes.wintypes.DWORD),
+ ("dwFileDateMS", ctypes.wintypes.DWORD),
+ ("dwFileDateLS", ctypes.wintypes.DWORD),
+ ]
+
+ P_VS_FIXEDFILEINFO = ctypes.POINTER(VS_FIXEDFILEINFO)
+
 def _get_real_winver(maj, min, build):
 if maj < 6 or (maj == 6 and min < 2):
 return maj, min, build
 
- from ctypes import (c_buffer, POINTER, byref, create_unicode_buffer,
- Structure, WinDLL)
- from ctypes.wintypes import DWORD, HANDLE
-
- class VS_FIXEDFILEINFO(Structure):
- _fields_ = [
- ("dwSignature", DWORD),
- ("dwStrucVersion", DWORD),
- ("dwFileVersionMS", DWORD),
- ("dwFileVersionLS", DWORD),
- ("dwProductVersionMS", DWORD),
- ("dwProductVersionLS", DWORD),
- ("dwFileFlagsMask", DWORD),
- ("dwFileFlags", DWORD),
- ("dwFileOS", DWORD),
- ("dwFileType", DWORD),
- ("dwFileSubtype", DWORD),
- ("dwFileDateMS", DWORD),
- ("dwFileDateLS", DWORD),
- ]
-
- kernel32 = WinDLL('kernel32')
- version = WinDLL('version')
-
+ kernel32 = ctypes.WinDLL('kernel32')
 # We will immediately double the length up to MAX_PATH, but the
 # path may be longer, so we retry until the returned string is
 # shorter than our buffer.
 name_len = actual_len = 130
 while actual_len == name_len:
 name_len *= 2
- name = create_unicode_buffer(name_len)
- actual_len = kernel32.GetModuleFileNameW(HANDLE(kernel32._handle),
- name, len(name))
+ name = ctypes.create_unicode_buffer(name_len)
+ actual_len = kernel32.GetModuleFileNameW(
+ ctypes.wintypes.HANDLE(kernel32._handle),
+ name, len(name)
+ )
 if not actual_len:
 return maj, min, build
 
+ version = ctypes.WinDLL('version')
 size = version.GetFileVersionInfoSizeW(name, None)
 if not size:
 return maj, min, build
 
- ver_block = c_buffer(size)
+ ver_block = ctypes.c_buffer(size)
 if (not version.GetFileVersionInfoW(name, None, size, ver_block) or
 not ver_block):
 return maj, min, build
 
- pvi = POINTER(VS_FIXEDFILEINFO)()
- if not version.VerQueryValueW(ver_block, "", byref(pvi), byref(DWORD())):
+ pvi = P_VS_FIXEDFILEINFO()
+ if not version.VerQueryValueW(ver_block, "",
+ ctypes.byref(pvi), ctypes.byref(ctypes.wintypes.DWORD())):
 return maj, min, build
 
 maj = pvi.contents.dwProductVersionMS >> 16
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -125,6 +125,8 @@
 Library
 -------
 
+- Issue #27932: Fixes memory leak in platform.win32_ver()
+
 - Issue #14977: mailcap now respects the order of the lines in the mailcap
 files ("first match"), as required by RFC 1542. Patch by Michael Lazar.
 
-- 
Repository URL: https://hg.python.org/cpython
