From bb578b403deef87c90b330f860ad35d80433b702 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 22 Jul 2016 00:40:50 +0200 Subject: [PATCH] Be more defensive about width/height/pitch given to FlatInput and YCbCrInput. --- flat_input.h | 3 +++ ycbcr_input.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/flat_input.h b/flat_input.h index b337788..bcaca50 100644 --- a/flat_input.h +++ b/flat_input.h @@ -109,17 +109,20 @@ public: // you will need to re-set it after this call. void set_width(unsigned width) { + assert(width != 0); this->pitch = this->width = width; invalidate_pixel_data(); } void set_height(unsigned height) { + assert(height != 0); this->height = height; invalidate_pixel_data(); } void set_pitch(unsigned pitch) { + assert(pitch != 0); this->pitch = pitch; invalidate_pixel_data(); } diff --git a/ycbcr_input.h b/ycbcr_input.h index 3aed51b..d0e71e2 100644 --- a/ycbcr_input.h +++ b/ycbcr_input.h @@ -83,6 +83,7 @@ public: // you will need to re-set it after this call. void set_width(unsigned width) { + assert(width != 0); this->width = width; assert(width % ycbcr_format.chroma_subsampling_x == 0); @@ -94,6 +95,7 @@ public: void set_height(unsigned height) { + assert(height != 0); this->height = height; assert(height % ycbcr_format.chroma_subsampling_y == 0); @@ -105,6 +107,7 @@ public: void set_pitch(unsigned channel, unsigned pitch) { + assert(pitch != 0); assert(channel >= 0 && channel < num_channels); this->pitch[channel] = pitch; invalidate_pixel_data(); -- 2.39.2