diff --git a/src/dec/io.c b/src/dec/io.c
index 86e398a3..36d03ba7 100644
--- a/src/dec/io.c
+++ b/src/dec/io.c
@@ -293,7 +293,7 @@ static int InitYUVRescaler(const VP8Io* const io, WebPDecParams* const p) {
   if (has_alpha) {
     tmp_size += work_size * sizeof(*work);
   }
-  p->memory = WebPSafeCalloc(1ULL, tmp_size);
+  p->memory = WebPSafeMalloc(1ULL, tmp_size);
   if (p->memory == NULL) {
     return 0;   // memory error
   }
@@ -465,7 +465,7 @@ static int InitRGBRescaler(const VP8Io* const io, WebPDecParams* const p) {
     tmp_size2 += out_width;
   }
   total_size = tmp_size1 * sizeof(*work) + tmp_size2 * sizeof(*tmp);
-  p->memory = WebPSafeCalloc(1ULL, total_size);
+  p->memory = WebPSafeMalloc(1ULL, total_size);
   if (p->memory == NULL) {
     return 0;   // memory error
   }
diff --git a/src/dec/vp8l.c b/src/dec/vp8l.c
index 20fc6a59..97b23a61 100644
--- a/src/dec/vp8l.c
+++ b/src/dec/vp8l.c
@@ -426,7 +426,7 @@ static int AllocateAndInitRescaler(VP8LDecoder* const dec, VP8Io* const io) {
   const uint64_t memory_size = sizeof(*dec->rescaler) +
                                work_size * sizeof(*work) +
                                scaled_data_size * sizeof(*scaled_data);
-  uint8_t* memory = (uint8_t*)WebPSafeCalloc(memory_size, sizeof(*memory));
+  uint8_t* memory = (uint8_t*)WebPSafeMalloc(memory_size, sizeof(*memory));
   if (memory == NULL) {
     dec->status_ = VP8_STATUS_OUT_OF_MEMORY;
     return 0;
diff --git a/src/enc/picture_rescale.c b/src/enc/picture_rescale.c
index 633d1dd6..794808bf 100644
--- a/src/enc/picture_rescale.c
+++ b/src/enc/picture_rescale.c
@@ -182,7 +182,6 @@ static void RescalePlane(const uint8_t* src,
   WebPRescalerInit(&rescaler, src_width, src_height,
                    dst, dst_width, dst_height, dst_stride,
                    num_channels, work);
-  memset(work, 0, 2 * dst_width * num_channels * sizeof(*work));
   while (y < src_height) {
     y += WebPRescalerImport(&rescaler, src_height - y,
                             src + y * src_stride, src_stride);
diff --git a/src/utils/rescaler.c b/src/utils/rescaler.c
index 375cc549..93856d6d 100644
--- a/src/utils/rescaler.c
+++ b/src/utils/rescaler.c
@@ -13,6 +13,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 #include "../dsp/dsp.h"
 #include "./rescaler.h"
 
@@ -46,6 +47,7 @@ void WebPRescalerInit(WebPRescaler* const wrk, int src_width, int src_height,
       ((int64_t)dst_height << WEBP_RESCALER_RFIX) / (wrk->x_add * src_height);
   wrk->irow = work;
   wrk->frow = work + num_channels * dst_width;
+  memset(work, 0, 2 * dst_width * num_channels * sizeof(*work));
 
   WebPRescalerDspInit();
 }