ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb-mtp: handle usb_mtp_get_object failure 

Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2014-05-20 13:06:55 +02:00
parent 68206d7342
commit 22513a9b44
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb/dev-mtp.c
View File

@ -46,6 +46,7 @@ enum mtp_code {
/* response codes */ /* response codes */
RES_OK = 0x2001, RES_OK = 0x2001,
RES_GENERAL_ERROR = 0x2002,
RES_SESSION_NOT_OPEN = 0x2003, RES_SESSION_NOT_OPEN = 0x2003,
RES_INVALID_TRANSACTION_ID = 0x2004, RES_INVALID_TRANSACTION_ID = 0x2004,
RES_OPERATION_NOT_SUPPORTED = 0x2005, RES_OPERATION_NOT_SUPPORTED = 0x2005,
@ -828,7 +829,9 @@ static void usb_mtp_command(MTPState *s, MTPControl *c)
} }
data_in = usb_mtp_get_object(s, c, o); data_in = usb_mtp_get_object(s, c, o);
if (NULL == data_in) { if (NULL == data_in) {
fprintf(stderr, "%s: TODO: handle error\n", __func__); usb_mtp_queue_result(s, RES_GENERAL_ERROR,
c->trans, 0, 0, 0);
return;
} }
break; break;
case CMD_GET_PARTIAL_OBJECT: case CMD_GET_PARTIAL_OBJECT:
@ -845,7 +848,9 @@ static void usb_mtp_command(MTPState *s, MTPControl *c)
} }
data_in = usb_mtp_get_partial_object(s, c, o); data_in = usb_mtp_get_partial_object(s, c, o);
if (NULL == data_in) { if (NULL == data_in) {
fprintf(stderr, "%s: TODO: handle error\n", __func__); usb_mtp_queue_result(s, RES_GENERAL_ERROR,
c->trans, 0, 0, 0);
return;
} }
nres = 1; nres = 1;
res0 = data_in->length; res0 = data_in->length;