From 67e1d52783f506c00d7a12eff3fdb2eb268b8dbd Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Thu, 22 Jul 2010 15:30:22 +0000
Subject: [PATCH] swscale-test: allocate more memory to prevent scalers from
writing out of bounds
Some converters (ie. unscaled rgb24 -> argb) may write some bytes out of
bounds. Ideally the converters should be fixed, but in the meantime we allocate
more memory to prevent heap corruption.
Originally committed as revision 31768 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
---
libswscale/swscale-test.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c
index d19f521f9f1..4dec6d38afa 100644
--- a/libswscale/swscale-test.c
+++ b/libswscale/swscale-test.c
@@ -106,8 +106,10 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
* prefer, as long as they're aligned enough for the architecture, and
* they're freed appropriately (such as using av_free for buffers
* allocated with av_malloc). */
- src[i]= av_mallocz(srcStride[i]*srcH);
- dst[i]= av_mallocz(dstStride[i]*dstH);
+ /* An extra 16 bytes is being allocated because some scalers may write
+ * out of bounds. */
+ src[i]= av_mallocz(srcStride[i]*srcH+16);
+ dst[i]= av_mallocz(dstStride[i]*dstH+16);
out[i]= av_mallocz(refStride[i]*h);
if (!src[i] || !dst[i] || !out[i]) {
perror("Malloc");
--
GitLab