[PATCH 0/1] MR1788: twain_32: Handle realloc failure in twain_add_onedriver (cppcheck).

[PATCH 1/1] twain_32: Handle realloc failure in twain_add_onedriver (cppcheck).

[Alex Henrie]

From: Alex Henrie

---
 dlls/twain_32/dsm_ctrl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c
index 6854093017a..13503e6772c 100644
--- a/dlls/twain_32/dsm_ctrl.c
+++ b/dlls/twain_32/dsm_ctrl.c
@@ -53,6 +53,7 @@ twain_add_onedriver(const WCHAR *dsname) {
    DSENTRYPROC	dsEntry;
    TW_IDENTITY	fakeOrigin;
    TW_IDENTITY	sourceId;
+	struct all_devices *new_devices;
    TW_UINT16	ret;
         WCHAR path[MAX_PATH];

@@ -89,7 +90,10 @@ twain_add_onedriver(const WCHAR *dsname) {
    	}
    	if (i < nrdevices)
    		break;
-                devices = realloc( devices, sizeof(devices[0])*(nrdevices+1) );
+		new_devices = realloc( devices, sizeof(devices[0]) * (nrdevices + 1) );
+		if (!new_devices)
+			break;
+		devices = new_devices;
    	devices[nrdevices].modname = wcsdup( path );
    	devices[nrdevices].identity = sourceId;
    	nrdevices++;

[PATCH 0/1] MR1788: twain_32: Handle realloc failure in twain_add_onedriver (cppcheck). - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.