d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkimg(1): let calloc(3) do the multiplication.

Browse Source 
Reviewed by:	marcel
MFC after:	1 week
This commit is contained in:
Pedro F. Giffuni 2017-03-13 20:14:07 +00:00
parent bba279e552
commit 6613eaa42b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=315212
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/mkimg/qcow.c
View File

@ -216,7 +216,7 @@ qcow_write(int fd, u_int version)
ofs = clstrsz * l2clno; ofs = clstrsz * l2clno;
nclstrs = 1 + clstr_l1tblsz + clstr_rctblsz; nclstrs = 1 + clstr_l1tblsz + clstr_rctblsz;
l1tbl = calloc(1, clstrsz * clstr_l1tblsz); l1tbl = calloc(clstr_l1tblsz, clstrsz);
if (l1tbl == NULL) { if (l1tbl == NULL) {
error = ENOMEM; error = ENOMEM;
goto out; goto out;
@ -247,7 +247,7 @@ qcow_write(int fd, u_int version)
} while (n < clstr_rcblks); } while (n < clstr_rcblks);
if (rcclno > 0) { if (rcclno > 0) {
rctbl = calloc(1, clstrsz * clstr_rctblsz); rctbl = calloc(clstr_rctblsz, clstrsz);
if (rctbl == NULL) { if (rctbl == NULL) {
error = ENOMEM; error = ENOMEM;
goto out; goto out;
@ -297,7 +297,7 @@ qcow_write(int fd, u_int version)
l1tbl = NULL; l1tbl = NULL;
if (rcclno > 0) { if (rcclno > 0) {
rcblk = calloc(1, clstrsz * clstr_rcblks); rcblk = calloc(clstr_rcblks, clstrsz);
if (rcblk == NULL) { if (rcblk == NULL) {
error = ENOMEM; error = ENOMEM;
goto out; goto out;