From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Mon, 16 Dec 2013 09:45:18 +0000 (+0100)
Subject: libusbgx: Add error handling to gadget_read_string().
X-Git-Tag: libusbgx-v0.1.0~265
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46f3bd29d7a1a19017a3961da742f508a977f8cb;p=platform%2Fupstream%2Flibusbg.git

libusbgx: Add error handling to gadget_read_string().

Add error handling when gadget_read_buf() returns NULL.
If read of string fails, the string should be set as empty.

Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
[Port from libusbg and update description]
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
---

diff --git a/src/usbg.c b/src/usbg.c
index ca444db..6f752a9 100644
--- a/src/usbg.c
+++ b/src/usbg.c
@@ -123,11 +123,18 @@ static int usbg_read_int(char *path, char *name, char *file, int base)
 
 static void usbg_read_string(char *path, char *name, char *file, char *buf)
 {
-	char *p;
+	char *p = NULL;
+
+	p = usbg_read_buf(path, name, file, buf);
+	/* Check whether read was successful */
+	if (p != NULL) {
+		if ((p = strchr(buf, '\n')) != NULL)
+				*p = '\0';
+	} else {
+		/* Set this as empty string */
+		*buf = '\0';
+	}
 
-	usbg_read_buf(path, name, file, buf);
-	if ((p = strchr(buf, '\n')) != NULL)
-		*p = '\0';
 }
 
 static void usbg_write_buf(char *path, char *name, char *file, char *buf)
@@ -190,10 +197,14 @@ static void usbg_parse_function_attrs(struct function *f)
 	case F_RNDIS:
 		usbg_read_string(f->path, f->name, "dev_addr", str_addr);
 		addr = ether_aton(str_addr);
-		memcpy(&f->attr.net.dev_addr, addr, 6);
+		if (addr)
+			memcpy(&f->attr.net.dev_addr, addr, sizeof(struct ether_addr));
+
 		usbg_read_string(f->path, f->name, "host_addr", str_addr);
 		addr = ether_aton(str_addr);
-		memcpy(&f->attr.net.host_addr, addr, 6);
+		if(addr)
+			memcpy(&f->attr.net.host_addr, addr, sizeof(struct ether_addr));
+
 		usbg_read_string(f->path, f->name, "ifname", f->attr.net.ifname);
 		f->attr.net.qmult = usbg_read_dec(f->path, f->name, "qmult");
 		break;