2042316 - genesys: backend crashes because it attempts to access a member outside of vector

This commit is contained in:
Zdenek Dohnal 2022-01-20 10:49:35 +01:00
parent b690f5f3a9
commit 27aacddac3
2 changed files with 20 additions and 1 deletions

View File

@ -14,7 +14,7 @@
Summary: Scanner access software
Name: sane-backends
Version: 1.1.1
Release: 1%{?dist}
Release: 2%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@ -35,6 +35,8 @@ Patch0: sane-backends-1.0.25-udev.patch
Patch1: sane-backends-1.0.23-soname.patch
# Fedora-specific (for now): make installed sane-config multi-lib aware again
Patch2: sane-backends-1.0.23-sane-config-multilib.patch
# 2042316 - genesys: backend crashes because it attempts to access a member outside of vector
Patch3: sane-genesys-gl845-crash.patch
URL: http://www.sane-project.org
@ -155,6 +157,8 @@ access image acquisition devices available on the local host.
%patch0 -p1 -b .udev
%patch1 -p1 -b .soname
%patch2 -p1 -b .sane-config-multilib
# 2042316 - genesys: backend crashes because it attempts to access a member outside of vector
%patch3 -p1 -b .genesys-gl845-crash
%build
CFLAGS="%optflags -fno-strict-aliasing"
@ -428,6 +432,9 @@ exit 0
%{_unitdir}/saned@.service
%changelog
* Mon Jan 24 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-2
- 2042316 - genesys: backend crashes because it attempts to access a member outside of vector
* Thu Jan 20 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-1
- 2042563 - sane-backends-1.1.1 is available

View File

@ -0,0 +1,12 @@
diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
index 9552fa9..c95de7b 100644
--- a/backend/genesys/genesys.cpp
+++ b/backend/genesys/genesys.cpp
@@ -367,6 +367,7 @@ void sanei_genesys_create_default_gamma_table(Genesys_Device* dev,
}
max = size - 1;
} else if (dev->model->asic_type == AsicType::GL124 ||
+ dev->model->asic_type == AsicType::GL845 ||
dev->model->asic_type == AsicType::GL846 ||
dev->model->asic_type == AsicType::GL847) {
size = 257;