提交 cc597832 编写于 作者: B Blue Swirl

Replace qemu_malloc + memset with qemu_mallocz

Replace a qemu_malloc call, followed by a memset, with qemu_mallocz.

Found with this Coccinelle semantic patch, adapted from
Coccinelle test package rule 94:
@@
type T;
expression x;
expression E;
@@

- x = (T)qemu_malloc(E)
+ x = qemu_mallocz(E)
  ...
(
- memset(x,0,E);
|
- memset(x,0,sizeof(*x));
)

Some files (tests/*) had to be filtered out.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 66fe09ee
...@@ -431,9 +431,8 @@ int sh_intc_init(struct intc_desc *desc, ...@@ -431,9 +431,8 @@ int sh_intc_init(struct intc_desc *desc,
desc->nr_prio_regs = nr_prio_regs; desc->nr_prio_regs = nr_prio_regs;
i = sizeof(struct intc_source) * nr_sources; i = sizeof(struct intc_source) * nr_sources;
desc->sources = qemu_malloc(i); desc->sources = qemu_mallocz(i);
memset(desc->sources, 0, i);
for (i = 0; i < desc->nr_sources; i++) { for (i = 0; i < desc->nr_sources; i++) {
struct intc_source *source = desc->sources + i; struct intc_source *source = desc->sources + i;
......
...@@ -1969,9 +1969,8 @@ static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err) ...@@ -1969,9 +1969,8 @@ static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err)
end = old_name; end = old_name;
} }
new_name = qemu_malloc(end - old_name + vs->v9stat.name.size + 1); new_name = qemu_mallocz(end - old_name + vs->v9stat.name.size + 1);
memset(new_name, 0, end - old_name + vs->v9stat.name.size + 1);
memcpy(new_name, old_name, end - old_name); memcpy(new_name, old_name, end - old_name);
memcpy(new_name + (end - old_name), vs->v9stat.name.data, memcpy(new_name + (end - old_name), vs->v9stat.name.data,
vs->v9stat.name.size); vs->v9stat.name.size);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册