timoreo/quirc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid division by zero.

Browse source 
Before this patch, small images (i.e. 7x7 pixels or less) could trigger
SIGFPE because of a (integer) division by zero.
This commit is contained in:
Alexandre Perrin 2016-10-04 11:10:55 +02:00
parent 87e79e769b
commit 93adbb0b11
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/identify.c
View file

@ -174,6 +174,7 @@ static void flood_fill_seed(struct quirc *q, int x, int y, int from, int to,
* Adaptive thresholding * Adaptive thresholding
*/ */
#define THRESHOLD_S_MIN 1
#define THRESHOLD_S_DEN 8 #define THRESHOLD_S_DEN 8
#define THRESHOLD_T 5 #define THRESHOLD_T 5
@ -185,6 +186,15 @@ static void threshold(struct quirc *q)
int threshold_s = q->w / THRESHOLD_S_DEN; int threshold_s = q->w / THRESHOLD_S_DEN;
quirc_pixel_t *row = q->pixels; quirc_pixel_t *row = q->pixels;
/*
* Ensure a sane, non-zero value for threshold_s to
*
* threshold_s can be zero if the image width is small. We need to avoid
* SIGFPE as it will be used as divisor.
*/
if (threshold_s < THRESHOLD_S_MIN)
threshold_s = THRESHOLD_S_MIN;
for (y = 0; y < q->h; y++) { for (y = 0; y < q->h; y++) {
int row_average[q->w]; int row_average[q->w];