pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #38048

Browse Source
This commit is contained in:
Svetlana Kulikova
2023-12-04 17:07:54 +03:00
parent b0257d138f
commit b7627222d3
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PdfFile/lib/xpdf/Gfx.cc
View File

@ -4161,10 +4161,10 @@ GBool Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
obj1.free();
dict->lookup("W", &obj1);
}
if (!obj1.isInt()) {
if (!obj1.isNum()) {
goto err2;
}
width = obj1.getInt();
width = obj1.getNum();
obj1.free();
if (width <= 0) {
goto err1;
@ -4174,10 +4174,10 @@ GBool Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
obj1.free();
dict->lookup("H", &obj1);
}
if (!obj1.isInt()) {
if (!obj1.isNum()) {
goto err2;
}
height = obj1.getInt();
height = obj1.getNum();
obj1.free();
if (height <= 0) {
goto err1;
@ -4345,26 +4345,26 @@ GBool Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
obj1.free();
maskDict->lookup("W", &obj1);
}
if (!obj1.isInt()) {
if (!obj1.isNum()) {
delete colorMap;
maskObj.free();
smaskObj.free();
goto err2;
}
maskWidth = obj1.getInt();
maskWidth = obj1.getNum();
obj1.free();
maskDict->lookup("Height", &obj1);
if (obj1.isNull()) {
obj1.free();
maskDict->lookup("H", &obj1);
}
if (!obj1.isInt()) {
if (!obj1.isNum()) {
delete colorMap;
maskObj.free();
smaskObj.free();
goto err2;
}
maskHeight = obj1.getInt();
maskHeight = obj1.getNum();
obj1.free();
if (maskWidth <= 0 || maskHeight <= 0) {
delete colorMap;
@ -4493,26 +4493,26 @@ GBool Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
obj1.free();
maskDict->lookup("W", &obj1);
}
if (!obj1.isInt()) {
if (!obj1.isNum()) {
delete colorMap;
maskObj.free();
smaskObj.free();
goto err2;
}
maskWidth = obj1.getInt();
maskWidth = obj1.getNum();
obj1.free();
maskDict->lookup("Height", &obj1);
if (obj1.isNull()) {
obj1.free();
maskDict->lookup("H", &obj1);
}
if (!obj1.isInt()) {
if (!obj1.isNum()) {
delete colorMap;
maskObj.free();
smaskObj.free();
goto err2;
}
maskHeight = obj1.getInt();
maskHeight = obj1.getNum();
obj1.free();
if (maskWidth <= 0 || maskHeight <= 0) {
delete colorMap;