Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix NULL pointer in get_storage_number()

Browse Source
This commit is contained in:
Kovid Goyal 2016-01-18 13:09:03 +05:30
parent db9edd162c
commit d2bd44d024
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/devices/winusb.py
View File

@ -386,8 +386,9 @@ def iterancestors(devinst):
def get_storage_number(devpath): def get_storage_number(devpath):
sdn = STORAGE_DEVICE_NUMBER() sdn = STORAGE_DEVICE_NUMBER()
handle = CreateFile(devpath, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, None, OPEN_EXISTING, 0, None) handle = CreateFile(devpath, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, None, OPEN_EXISTING, 0, None)
bytes_returned = DWORD(0)
try: try:
DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, None, 0, byref(sdn), sizeof(STORAGE_DEVICE_NUMBER), None, None) DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, None, 0, byref(sdn), sizeof(STORAGE_DEVICE_NUMBER), byref(bytes_returned), None)
finally: finally:
CloseHandle(handle) CloseHandle(handle)
return sdn.as_tuple() return sdn.as_tuple()