Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a mem leak in the windows PNP drive scanner

Browse Source
This commit is contained in:
Kovid Goyal 2012-09-09 22:48:22 +05:30
parent 7bba2267b0
commit d638319b30
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/calibre/utils/windows/winutil.c
View File

@ -607,31 +607,28 @@ winutil_get_removable_drives(PyObject *self, PyObject *args) {
return NULL; return NULL;
} }
ddebug = PyObject_IsTrue(pdebug); // Find all removable drives
for (j = 0; j < MAX_DRIVES; j++) g_drives[j].letter = 0;
if (!get_all_removable_disks(g_drives)) return NULL;
volumes = PyDict_New(); volumes = PyDict_New();
if (volumes == NULL) return NULL; if (volumes == NULL) return PyErr_NoMemory();
ddebug = PyObject_IsTrue(pdebug);
for (j = 0; j < MAX_DRIVES; j++) g_drives[j].letter = 0;
// Find all removable drives
if (!get_all_removable_disks(g_drives)) {
return NULL;
}
hDevInfo = create_device_info_set((LPGUID)&GUID_DEVINTERFACE_VOLUME, hDevInfo = create_device_info_set((LPGUID)&GUID_DEVINTERFACE_VOLUME,
NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
if (hDevInfo == INVALID_HANDLE_VALUE) return NULL; if (hDevInfo == INVALID_HANDLE_VALUE) { Py_DECREF(volumes); return NULL; }
// Enumerate through the set // Enumerate through the set
for (i=0; iterate; i++) { for (i=0; iterate; i++) {
candidates = PyList_New(0); candidates = PyList_New(0);
if (candidates == NULL) return PyErr_NoMemory(); if (candidates == NULL) { Py_DECREF(volumes); return PyErr_NoMemory();}
interfaceDetailData = get_device_ancestors(hDevInfo, i, candidates, &iterate, ddebug); interfaceDetailData = get_device_ancestors(hDevInfo, i, candidates, &iterate, ddebug);
if (interfaceDetailData == NULL) { if (interfaceDetailData == NULL) {
PyErr_Print(); continue; PyErr_Print();
Py_DECREF(candidates); candidates = NULL;
continue;
} }
length = wcslen(interfaceDetailData->DevicePath); length = wcslen(interfaceDetailData->DevicePath);
@ -653,12 +650,13 @@ winutil_get_removable_drives(PyObject *self, PyObject *args) {
key = PyBytes_FromFormat("%c", (char)g_drives[j].letter); key = PyBytes_FromFormat("%c", (char)g_drives[j].letter);
if (key == NULL) return PyErr_NoMemory(); if (key == NULL) return PyErr_NoMemory();
PyDict_SetItem(volumes, key, candidates); PyDict_SetItem(volumes, key, candidates);
Py_DECREF(candidates); Py_DECREF(key); key = NULL;
break; break;
} }
} }
} }
Py_XDECREF(candidates); candidates = NULL;
PyMem_Free(interfaceDetailData); PyMem_Free(interfaceDetailData);
} //for } //for