Fixed overflow (bug #300389).

merge-requests/1/head
Henning Geinitz 2003-12-21 21:54:29 +00:00
rodzic a4b0143586
commit c4743af452
2 zmienionych plików z 5 dodań i 2 usunięć

Wyświetl plik

@ -3,6 +3,7 @@
* backend/test.c doc/descriptions/test.desc: Fixed initial value
for --fixed-constraint-range (bug #300388).
* include/sane/sanei_usb.h: Include stdlib.h for size_t.
* sanei/sanei_constrain_value.c: Fixed overflow (bug #300389).
2003-12-18 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/sane-plustek.man: new version, minor fixes

Wyświetl plik

@ -45,6 +45,8 @@
#include <sys/types.h>
#include <stdlib.h>
#include <stdio.h>
#include "sane/sane.h"
#include "sane/sanei.h"
@ -71,7 +73,7 @@ sanei_check_value (const SANE_Option_Descriptor * opt, void * value)
if (range->quant)
{
v = (w - range->min + range->quant/2) / range->quant;
v = (unsigned int) (w - range->min + range->quant/2) / range->quant;
v = v * range->quant + range->min;
if (v != w)
return SANE_STATUS_INVAL;
@ -143,7 +145,7 @@ sanei_constrain_value (const SANE_Option_Descriptor * opt, void * value,
if (range->quant)
{
v = (w - range->min + range->quant/2) / range->quant;
v = (unsigned int) (w - range->min + range->quant/2) / range->quant;
v = v * range->quant + range->min;
if (v != w)
{