openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

do not check pointers after dereferencing them 

Two instances, both spotted by Coverity.  In one, two blocks were
swapped.  In the other, the check is not needed anymore.

Cc: qemu-stable@nongnu.org
Cc: qemu-trivial@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Paolo Bonzini 2013-05-31 14:00:27 +02:00 committed by Michael Tokarev
parent cd2e64ce30
commit a4cc73d629
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor.c
View File

@ -280,7 +280,7 @@ void monitor_flush(Monitor *mon)
buf = qstring_get_str(mon->outbuf); buf = qstring_get_str(mon->outbuf);
len = qstring_get_length(mon->outbuf); len = qstring_get_length(mon->outbuf);
if (mon && len && !mon->mux_out) { if (len && !mon->mux_out) {
rc = qemu_chr_fe_write(mon->chr, (const uint8_t *) buf, len); rc = qemu_chr_fe_write(mon->chr, (const uint8_t *) buf, len);
if (rc == len) { if (rc == len) {
/* all flushed */ /* all flushed */

8
savevm.c
View File

@ -322,13 +322,13 @@ QEMUFile *qemu_popen_cmd(const char *command, const char *mode)
FILE *stdio_file; FILE *stdio_file;
QEMUFileStdio *s; QEMUFileStdio *s;
stdio_file = popen(command, mode); if (mode == NULL || (mode[0] != 'r' && mode[0] != 'w') || mode[1] != 0) {
if (stdio_file == NULL) { fprintf(stderr, "qemu_popen: Argument validity check failed\n");
return NULL; return NULL;
} }
if (mode == NULL || (mode[0] != 'r' && mode[0] != 'w') || mode[1] != 0) { stdio_file = popen(command, mode);
fprintf(stderr, "qemu_popen: Argument validity check failed\n"); if (stdio_file == NULL) {
return NULL; return NULL;
} }