| Message ID | 1337683555-13301-11-git-send-email-lersek@redhat.com |
|---|---|
| State | New |
| Headers | show |
Il 22/05/2012 12:45, Laszlo Ersek ha scritto: > Signed-off-by: Laszlo Ersek <lersek@redhat.com> > --- > net/dump.c | 21 +++++++++++++++++---- > 1 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/net/dump.c b/net/dump.c > index 27e9528..a1de09e 100644 > --- a/net/dump.c > +++ b/net/dump.c > @@ -144,22 +144,35 @@ static int net_dump_init(VLANState *vlan, const char *device, > return 0; > } > > -int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts, > +int net_init_dump(QemuOpts *old_opts, const NetClientOptions *opts, > const char *name, VLANState *vlan) > { > int len; > const char *file; > char def_file[128]; > + const NetdevDumpOptions *dump; > + > + assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP); > + dump = opts->dump; > > assert(vlan); > > - file = qemu_opt_get(opts, "file"); > - if (!file) { > + if (dump->has_file) { > + file = dump->file; > + } else { > snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id); > file = def_file; > } > > - len = qemu_opt_get_size(opts, "len", 65536); > + if (dump->has_len) { > + if (dump->len > INT_MAX) { > + error_report("invalid length: %"PRId64, dump->len); Nice attention to detail. :) But why not test < 0 too since we're at it? Paolo > + return -1; > + } > + len = dump->len; > + } else { > + len = 65536; > + } > > return net_dump_init(vlan, "dump", name, file, len); > }
diff --git a/net/dump.c b/net/dump.c index 27e9528..a1de09e 100644 --- a/net/dump.c +++ b/net/dump.c @@ -144,22 +144,35 @@ static int net_dump_init(VLANState *vlan, const char *device, return 0; } -int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts, +int net_init_dump(QemuOpts *old_opts, const NetClientOptions *opts, const char *name, VLANState *vlan) { int len; const char *file; char def_file[128]; + const NetdevDumpOptions *dump; + + assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP); + dump = opts->dump; assert(vlan); - file = qemu_opt_get(opts, "file"); - if (!file) { + if (dump->has_file) { + file = dump->file; + } else { snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id); file = def_file; } - len = qemu_opt_get_size(opts, "len", 65536); + if (dump->has_len) { + if (dump->len > INT_MAX) { + error_report("invalid length: %"PRId64, dump->len); + return -1; + } + len = dump->len; + } else { + len = 65536; + } return net_dump_init(vlan, "dump", name, file, len); }
Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- net/dump.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-)