External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-22 14:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

snapshot: avoid virsh crash with older servers

Browse Source 
Commits 51082301, 16d7b39, and 521cc447 introduced support for
'virsh snapshot-list --from' when talking to a server older than
0.9.5, but broke support for plain 'virsh snapshot-list' for the
same old server in the process.  Because the code is not properly
gated, we end up with a SIGSEGV during a strcmp with a NULL argument.

* tools/virsh.c (cmdSnapshotList): Don't waste time on fallbacks
when --from is not present.
This commit is contained in:
Eric Blake 2012-06-07 21:46:47 -06:00
parent d41d252694
commit d9f6066598
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/virsh.c
View File

@ -16740,10 +16740,10 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
qsort(&names[0], actual, sizeof(char*), namesorter); qsort(&names[0], actual, sizeof(char*), namesorter);
if (tree || ctl->useSnapshotOld) { if (tree || (from && ctl->useSnapshotOld)) {
parents = vshCalloc(ctl, sizeof(char *), actual); parents = vshCalloc(ctl, sizeof(char *), actual);
for (i = (from && !ctl->useSnapshotOld); i < actual; i++) { for (i = (from && !ctl->useSnapshotOld); i < actual; i++) {
if (ctl->useSnapshotOld && STREQ(names[i], from)) { if (from && ctl->useSnapshotOld && STREQ(names[i], from)) {
start_index = i; start_index = i;
continue; continue;
} }
@ -16765,7 +16765,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
char indentBuf[INDENT_BUFLEN]; char indentBuf[INDENT_BUFLEN];
for (i = 0 ; i < actual ; i++) { for (i = 0 ; i < actual ; i++) {
memset(indentBuf, '\0', sizeof(indentBuf)); memset(indentBuf, '\0', sizeof(indentBuf));
if (ctl->useSnapshotOld ? STREQ(names[i], from) : !parents[i]) if ((from && ctl->useSnapshotOld) ? STREQ(names[i], from) :
!parents[i])
cmdNodeListDevicesPrint(ctl, cmdNodeListDevicesPrint(ctl,
names, names,
parents, parents,
@ -16834,7 +16835,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
} }
for (i = 0; i < actual; i++) { for (i = 0; i < actual; i++) {
if (ctl->useSnapshotOld && if (from && ctl->useSnapshotOld &&
(descendants ? !names[i] : STRNEQ_NULLABLE(parents[i], from))) (descendants ? !names[i] : STRNEQ_NULLABLE(parents[i], from)))
continue; continue;