From 74416281b0a13735bcbde178fc084fbe80b1a33e Mon Sep 17 00:00:00 2001
From: ppatience0 <ppatience0@gmail.com>
Date: Sat, 1 Jun 2013 17:14:50 -0400
Subject: readgif, readjpg: fix incorrect malloc arguments: use
 sizeof(Rawimage*) instead of sizeof(Rawimage**) and 2*sizeof(Rawimage*)
 instead of sizeof(Header)

readtga: switch calloc arguments: nelem is supposed to first, elsize second
---
 sys/src/cmd/jpg/readgif.c | 2 +-
 sys/src/cmd/jpg/readjpg.c | 2 +-
 sys/src/cmd/jpg/readtga.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/src/cmd/jpg/readgif.c b/sys/src/cmd/jpg/readgif.c
index 3521753fd..0a5edd364 100644
--- a/sys/src/cmd/jpg/readgif.c
+++ b/sys/src/cmd/jpg/readgif.c
@@ -156,7 +156,7 @@ readarray(Header *h)
 
 	if(h->fields & 0x80)
 		h->globalcmap = readcmap(h, (h->fields&7)+1);
-	array = malloc(sizeof(Rawimage**));
+	array = malloc(sizeof(Rawimage*));
 	if(array == nil)
 		giferror(h, memerr);
 	nimages = 0;
diff --git a/sys/src/cmd/jpg/readjpg.c b/sys/src/cmd/jpg/readjpg.c
index c50260e5d..a3ab3ed8a 100644
--- a/sys/src/cmd/jpg/readjpg.c
+++ b/sys/src/cmd/jpg/readjpg.c
@@ -247,7 +247,7 @@ Breadjpg(Biobuf *b, int colorspace)
 	}
 	jpginit();
 	h = malloc(sizeof(Header));
-	array = malloc(sizeof(Header));
+	array = malloc(2*sizeof(Rawimage*));
 	if(h==nil || array==nil){
 		free(h);
 		free(array);
diff --git a/sys/src/cmd/jpg/readtga.c b/sys/src/cmd/jpg/readtga.c
index afea0fad0..b0ba260d3 100644
--- a/sys/src/cmd/jpg/readtga.c
+++ b/sys/src/cmd/jpg/readtga.c
@@ -404,12 +404,12 @@ Breadtga(Biobuf *bp)
 	}
 
 	array = nil;
-	if((ar = calloc(sizeof(Rawimage), 1)) == nil){
+	if((ar = calloc(1, sizeof(Rawimage))) == nil){
 		werrstr("ReadTGA: no memory - %r\n");
 		goto Error;
 	}
 
-	if((array = calloc(sizeof(Rawimage *), 2)) == nil){
+	if((array = calloc(2, sizeof(Rawimage *))) == nil){
 		werrstr("ReadTGA: no memory - %r\n");
 		goto Error;
 	}
-- 
cgit v1.2.3