From 166af423e44039a6f17d46d171cd90fcbee393aa Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Thu, 31 Dec 2015 19:53:09 +0100
Subject: Fix iokit_get_string_descriptor_ascii by returning the size of the
 string

---
 src/libirecovery.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libirecovery.c b/src/libirecovery.c
index d80d8cc..9284316 100644
--- a/src/libirecovery.c
+++ b/src/libirecovery.c
@@ -249,6 +249,7 @@ static int iokit_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc
 	request.wIndex = 0; // All languages 0x409; // language
 	request.wLength = sizeof(descriptor) - 1;
 	request.pData = descriptor;
+	request.wLenDone = 0;
 
 	result = (*client->handle)->DeviceRequest(client->handle, &request);
 	if (result == kIOReturnNoDevice)
@@ -262,6 +263,7 @@ static int iokit_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc
 
 		request.wValue = (kUSBStringDesc << 8) | desc_index;
 		request.wIndex = descriptor[2] + (descriptor[3] << 8);
+		request.wLenDone = 0;
 		result = (*client->handle)->DeviceRequest(client->handle, &request);
 
 		if (result == kIOReturnNoDevice)
@@ -277,7 +279,7 @@ static int iokit_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc
 		}
 		buffer[j] = 0;
 
-		return IRECV_E_SUCCESS;
+		return request.wLenDone;
 	}
 	return IRECV_E_UNKNOWN_ERROR;
 }
-- 
cgit v1.1-32-gdbae