GerbilSoft/rvthtool
1
Fork 0
mirror of https://github.com/GerbilSoft/rvthtool.git synced 2025-06-19 03:55:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

[librvth] query_udev.c: rvth_parse_udev_device(): Return an error code if malloc() fails.

Browse Source 
Similar to the query_win32.c version.
This commit is contained in:
David Korth 2022-07-14 02:05:51 -04:00
parent 7fe60c5c8e
commit 367d93997e
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/librvth/query_udev.c
View File

@ -61,10 +61,11 @@ static bool is_vid_pid_correct(struct udev_device *usb_dev)
/** /**
* Get RvtH_QueryEntry data for the specified udev device. * Get RvtH_QueryEntry data for the specified udev device.
* @param dev udev device node * @param dev [in] udev device node
* @param pErr [out,opt] Pointer to store positive POSIX error code in on error. (0 on success)
* @return Allocated RvtH_QueryEntry if it's an RVT-H Reader; NULL if not. * @return Allocated RvtH_QueryEntry if it's an RVT-H Reader; NULL if not.
*/ */
static RvtH_QueryEntry *rvth_parse_udev_device(struct udev_device *dev) static RvtH_QueryEntry *rvth_parse_udev_device(struct udev_device *dev, int *pErr)
{ {
RvtH_QueryEntry *entry; RvtH_QueryEntry *entry;
@ -74,6 +75,11 @@ static RvtH_QueryEntry *rvth_parse_udev_device(struct udev_device *dev)
const char *s_blk_size, *s_usb_serial; const char *s_blk_size, *s_usb_serial;
unsigned int hw_serial; unsigned int hw_serial;
if (pErr) {
// No error initially.
*pErr = 0;
}
// udev_device_get_devnode() returns the path to the device node itself in /dev. // udev_device_get_devnode() returns the path to the device node itself in /dev.
s_devnode = udev_device_get_devnode(dev); s_devnode = udev_device_get_devnode(dev);
if (!s_devnode) { if (!s_devnode) {
@ -122,6 +128,12 @@ static RvtH_QueryEntry *rvth_parse_udev_device(struct udev_device *dev)
// Create an RvtHQueryEntry. // Create an RvtHQueryEntry.
entry = malloc(sizeof(*entry)); entry = malloc(sizeof(*entry));
if (!entry) { if (!entry) {
if (pErr) {
*pErr = errno;
if (*pErr == 0) {
*pErr = ENOMEM;
}
}
return NULL; return NULL;
} }
entry->next = NULL; entry->next = NULL;
@ -180,6 +192,11 @@ RvtH_QueryEntry *rvth_query_devices(int *pErr)
struct udev_enumerate *enumerate; struct udev_enumerate *enumerate;
struct udev_list_entry *devices, *dev_list_entry; struct udev_list_entry *devices, *dev_list_entry;
if (pErr) {
// No error initially.
*pErr = 0;
}
// Create the udev object. // Create the udev object.
udev = udev_new(); udev = udev_new();
if (!udev) { if (!udev) {
@ -201,6 +218,7 @@ RvtH_QueryEntry *rvth_query_devices(int *pErr)
RvtH_QueryEntry *entry; RvtH_QueryEntry *entry;
struct udev_device *dev; struct udev_device *dev;
const char *path; const char *path;
int err;
// Get the filename of the /sys entry for the device // Get the filename of the /sys entry for the device
// and create a udev_device object (dev) representing it. // and create a udev_device object (dev) representing it.
@ -208,11 +226,21 @@ RvtH_QueryEntry *rvth_query_devices(int *pErr)
dev = udev_device_new_from_syspath(udev, path); dev = udev_device_new_from_syspath(udev, path);
// Attempt to get an RvtH_QueryEntry from this device node. // Attempt to get an RvtH_QueryEntry from this device node.
entry = rvth_parse_udev_device(dev); entry = rvth_parse_udev_device(dev, &err);
if (!entry) { if (!entry) {
// Not an RVT-H Reader. // Not an RVT-H Reader.
udev_device_unref(dev); udev_device_unref(dev);
continue; if (err == 0)
continue;
// An error occurred.
if (pErr) {
*pErr = err;
}
rvth_query_free(list_head);
list_head = NULL;
list_tail = NULL;
break;
} }
// RvtH_QueryEntry obtained. Add it to the list. // RvtH_QueryEntry obtained. Add it to the list.
@ -232,10 +260,6 @@ RvtH_QueryEntry *rvth_query_devices(int *pErr)
// Free the enumerator object. // Free the enumerator object.
udev_enumerate_unref(enumerate); udev_enumerate_unref(enumerate);
udev_unref(udev); udev_unref(udev);
if (pErr) {
*pErr = 0;
}
return list_head; return list_head;
} }