提交 077cd917 编写于 作者: M Miloslav Trmač 提交者: Daniel P. Berrange

Don't assume buffered output echoes the command.

The if ((nlptr...)) implicitly assumes commptr != NULL (and that "buf"
starts with "cmd").  Make the assumption explicit, it will be broken in
a future patch.

* src/qemu_driver.c: Don't assume buffered monitor output echoes the
  command.
上级 f340964d
...@@ -2473,10 +2473,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm, ...@@ -2473,10 +2473,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
* occurence, and inbetween the command and the newline starting * occurence, and inbetween the command and the newline starting
* the response * the response
*/ */
if ((commptr = strstr(buf, cmd))) if ((commptr = strstr(buf, cmd))) {
memmove(buf, commptr, strlen(commptr)+1); memmove(buf, commptr, strlen(commptr)+1);
if ((nlptr = strchr(buf, '\n'))) if ((nlptr = strchr(buf, '\n')))
memmove(buf+strlen(cmd), nlptr, strlen(nlptr)+1); memmove(buf+strlen(cmd), nlptr, strlen(nlptr)+1);
}
break; break;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册