mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-12 23:49:06 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix CID 1164704 (Untrusted value as argument)

Browse Source 
Limit the matrix to UINT16_MAX x UINT16_MAX.

Larger dimensions could also result in an arithmetic overflow
when multiplying the two dimensions.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2018-07-06 14:53:53 +02:00
parent 8871f4d622
commit c1da5fbac4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ccstruct/matrix.h
View File

@ -1,6 +1,6 @@
/* -*-C-*- /* -*-C-*-
****************************************************************************** ******************************************************************************
* File: matrix.h (Formerly matrix.h) * File: matrix.h
* Description: Generic 2-d array/matrix and banded triangular matrix class. * Description: Generic 2-d array/matrix and banded triangular matrix class.
* Author: Ray Smith * Author: Ray Smith
* TODO(rays) Separate from ratings matrix, which it also contains: * TODO(rays) Separate from ratings matrix, which it also contains:
@ -10,9 +10,6 @@
* Author: Mark Seaman, OCR Technology * Author: Mark Seaman, OCR Technology
* Created: Wed May 16 13:22:06 1990 * Created: Wed May 16 13:22:06 1990
* Modified: Tue Mar 19 16:00:20 1991 (Mark Seaman) marks@hpgrlt * Modified: Tue Mar 19 16:00:20 1991 (Mark Seaman) marks@hpgrlt
* Language: C
* Package: N/A
* Status: Experimental (Do Not Distribute)
* *
* (c) Copyright 1990, Hewlett-Packard Company. * (c) Copyright 1990, Hewlett-Packard Company.
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
@ -492,6 +489,9 @@ class GENERIC_2D_ARRAY {
ReverseN(&size1, sizeof(size1)); ReverseN(&size1, sizeof(size1));
ReverseN(&size2, sizeof(size2)); ReverseN(&size2, sizeof(size2));
} }
// Arbitrarily limit the number of elements to protect against bad data.
if (size1 > UINT16_MAX) return false;
if (size2 > UINT16_MAX) return false;
Resize(size1, size2, empty_); Resize(size1, size2, empty_);
return true; return true;
} }
@ -499,6 +499,9 @@ class GENERIC_2D_ARRAY {
int32_t size1, size2; int32_t size1, size2;
if (fp->FReadEndian(&size1, sizeof(size1), 1) != 1) return false; if (fp->FReadEndian(&size1, sizeof(size1), 1) != 1) return false;
if (fp->FReadEndian(&size2, sizeof(size2), 1) != 1) return false; if (fp->FReadEndian(&size2, sizeof(size2), 1) != 1) return false;
// Arbitrarily limit the number of elements to protect against bad data.
if (size1 > UINT16_MAX) return false;
if (size2 > UINT16_MAX) return false;
Resize(size1, size2, empty_); Resize(size1, size2, empty_);
return true; return true;
} }