summaryrefslogtreecommitdiff
path: root/sys/src/libmemdraw/alloc.c
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@gmx.de>2013-06-16 19:01:46 +0200
committercinap_lenrek <cinap_lenrek@gmx.de>2013-06-16 19:01:46 +0200
commit202be57bb94b2bd65db9164bfd94ad2ec5167071 (patch)
treea3e9b3e1911dc04058d0a6b320da1763a2919cae /sys/src/libmemdraw/alloc.c
parente36d9f5c4e667970a4a7aa15744e304ccc7c58f3 (diff)
draw: add badrect() function to reject zero, negative size or orverly huge rectangles
not checking the rectangle dimensions causes integer overflows and memory corruption. adding a new badrect() function that checks for these cases.
Diffstat (limited to 'sys/src/libmemdraw/alloc.c')
-rw-r--r--sys/src/libmemdraw/alloc.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/src/libmemdraw/alloc.c b/sys/src/libmemdraw/alloc.c
index 14abdf53d..d2852c3c4 100644
--- a/sys/src/libmemdraw/alloc.c
+++ b/sys/src/libmemdraw/alloc.c
@@ -27,14 +27,14 @@ allocmemimaged(Rectangle r, ulong chan, Memdata *md)
ulong l;
Memimage *i;
- if(Dx(r) <= 0 || Dy(r) <= 0){
- werrstr("bad rectangle %R", r);
- return nil;
- }
if((d = chantodepth(chan)) == 0) {
werrstr("bad channel descriptor %.8lux", chan);
return nil;
}
+ if(badrect(r)){
+ werrstr("bad rectangle %R", r);
+ return nil;
+ }
l = wordsperline(r, d);
@@ -76,8 +76,13 @@ allocmemimage(Rectangle r, ulong chan)
werrstr("bad channel descriptor %.8lux", chan);
return nil;
}
+ if(badrect(r)){
+ werrstr("bad rectangle %R", r);
+ return nil;
+ }
l = wordsperline(r, d);
+
nw = l*Dy(r);
md = malloc(sizeof(Memdata));
if(md == nil)