This commit is contained in:
committed by
Git OBS Bridge
parent
2e40c9b50c
commit
b52c73e219
@@ -1,21 +1,32 @@
|
||||
Index: xen-unstable/xen/tools/symbols.c
|
||||
Index: xen-3.0.5-testing/tools/ioemu/hw/piix4acpi.c
|
||||
===================================================================
|
||||
--- xen-unstable.orig/xen/tools/symbols.c
|
||||
+++ xen-unstable/xen/tools/symbols.c
|
||||
@@ -80,7 +80,8 @@ static int read_symbol(FILE *in, struct
|
||||
if (rc != 3) {
|
||||
if (rc != EOF) {
|
||||
/* skip line */
|
||||
- fgets(str, 500, in);
|
||||
+ if (fgets(str, sizeof(str), in) == NULL)
|
||||
+ ; /* don't care */
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
Index: xen-unstable/tools/misc/miniterm/miniterm.c
|
||||
--- xen-3.0.5-testing.orig/tools/ioemu/hw/piix4acpi.c
|
||||
+++ xen-3.0.5-testing/tools/ioemu/hw/piix4acpi.c
|
||||
@@ -69,6 +69,8 @@ static int piix4acpi_load(QEMUFile *f, v
|
||||
if (version_id > 1)
|
||||
return -EINVAL;
|
||||
qemu_get_be16s(f, &s->pm1_control);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static void acpiPm1Control_writeb(void *opaque, uint32_t addr, uint32_t val)
|
||||
Index: xen-3.0.5-testing/tools/ioemu/hw/usb-hid.c
|
||||
===================================================================
|
||||
--- xen-unstable.orig/tools/misc/miniterm/miniterm.c
|
||||
+++ xen-unstable/tools/misc/miniterm/miniterm.c
|
||||
--- xen-3.0.5-testing.orig/tools/ioemu/hw/usb-hid.c
|
||||
+++ xen-3.0.5-testing/tools/ioemu/hw/usb-hid.c
|
||||
@@ -557,6 +557,7 @@ int usb_mouse_load(QEMUFile *f, void *op
|
||||
fprintf(logfile, "usb_mouse_load:add usb_mouse_event.\n");
|
||||
qemu_add_mouse_event_handler(usb_mouse_event, s, 0);
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
|
||||
Index: xen-3.0.5-testing/tools/misc/miniterm/miniterm.c
|
||||
===================================================================
|
||||
--- xen-3.0.5-testing.orig/tools/misc/miniterm/miniterm.c
|
||||
+++ xen-3.0.5-testing/tools/misc/miniterm/miniterm.c
|
||||
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
|
||||
case 0:
|
||||
close(1); /* stdout not needed */
|
||||
@@ -49,15 +60,17 @@ Index: xen-unstable/tools/misc/miniterm/miniterm.c
|
||||
break;
|
||||
}
|
||||
|
||||
Index: xen-unstable/tools/ioemu/hw/usb-hid.c
|
||||
Index: xen-3.0.5-testing/xen/tools/symbols.c
|
||||
===================================================================
|
||||
--- xen-unstable.orig/tools/ioemu/hw/usb-hid.c
|
||||
+++ xen-unstable/tools/ioemu/hw/usb-hid.c
|
||||
@@ -557,6 +557,7 @@ int usb_mouse_load(QEMUFile *f, void *op
|
||||
fprintf(logfile, "usb_mouse_load:add usb_mouse_event.\n");
|
||||
qemu_add_mouse_event_handler(usb_mouse_event, s, 0);
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
|
||||
--- xen-3.0.5-testing.orig/xen/tools/symbols.c
|
||||
+++ xen-3.0.5-testing/xen/tools/symbols.c
|
||||
@@ -80,7 +80,8 @@ static int read_symbol(FILE *in, struct
|
||||
if (rc != 3) {
|
||||
if (rc != EOF) {
|
||||
/* skip line */
|
||||
- fgets(str, 500, in);
|
||||
+ if (fgets(str, sizeof(str), in) == NULL)
|
||||
+ ; /* don't care */
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user