diff -Nru kylin-photo-viewer-1.3.0.3/debian/changelog kylin-photo-viewer-1.3.0.3/debian/changelog
--- kylin-photo-viewer-1.3.0.3/debian/changelog 2024-04-16 09:47:42.000000000 +0800
+++ kylin-photo-viewer-1.3.0.3/debian/changelog 2025-01-13 16:48:07.000000000 +0800
@@ -1,3 +1,21 @@
+kylin-photo-viewer (1.3.0.3-ok20.4) yangtze; urgency=medium
+
+ * BUG号：#IBH0OI 【看图】CNVD-C-2024-946320漏洞验证通报
+ * 需求号：无
+ * 其他改动说明：无
+ * 影响域：无
+
+ -- sufang <sufang@kylinos.cn> Mon, 13 Jan 2025 16:48:07 +0800
+
+kylin-photo-viewer (1.3.0.3-ok20.3) yangtze; urgency=medium
+
+ * BUG号：#239870 KVE-2024-0701
+ * 需求号：无
+ * 其他改动说明：无
+ * 影响域：无
+
+ -- sufang <sufang@kylinos.cn> Mon, 05 Aug 2024 17:07:43 +0800
+
kylin-photo-viewer (1.3.0.3-ok20.2) yangtze; urgency=medium
* BUG号：无
diff -Nru kylin-photo-viewer-1.3.0.3/debian/patches/0017-133-fix-bug-239870.patch kylin-photo-viewer-1.3.0.3/debian/patches/0017-133-fix-bug-239870.patch
--- kylin-photo-viewer-1.3.0.3/debian/patches/0017-133-fix-bug-239870.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-photo-viewer-1.3.0.3/debian/patches/0017-133-fix-bug-239870.patch 2025-01-13 16:48:07.000000000 +0800
@@ -0,0 +1,52 @@
+From: =?utf-8?b?6IuP6Iqz?= <sufang@kylinos.cn>
+Date: Tue, 6 Aug 2024 00:42:39 +0000
+Subject: =?utf-8?q?!133_fix_bug=3A239870_Merge_pull_request_!133_from_?=
+ =?utf-8?q?=E8=8B=8F=E8=8A=B3/openkylin/yangtze?=
+
+---
+ codec/kylinimagecodec/image_load/image_load.cpp | 26 +++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/codec/kylinimagecodec/image_load/image_load.cpp b/codec/kylinimagecodec/image_load/image_load.cpp
+index 094bf75..599a581 100644
+--- a/codec/kylinimagecodec/image_load/image_load.cpp
++++ b/codec/kylinimagecodec/image_load/image_load.cpp
+@@ -250,18 +250,32 @@ Mat KylinImageCodec::loadFreeimageFormat(const char *filename)
+ Mat mat;
+ FIBITMAP *dib = NULL;
+
++ QFileInfo fi(QString::fromUtf8(filename));
++ QString suffix = fi.suffix();
++ QString file_suffix_lower = suffix.toLower();
++ QImageReader reader;
++ QImage res_qt;
++
++ reader.setFileName(QString(filename));
++ reader.setFormat(file_suffix_lower.toLatin1());
++ reader.setAutoTransform(true);
++
++ if(reader.imageCount() >= 0){
++ res_qt = reader.read();
++ if (res_qt.isNull()) {
++ qDebug()<<"获得图片格式失败或不支持此格式图片的读取";
++ return mat;
++ }
++ }
+ /* 获取文件格式 */
+ FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
+ fif = get_real_format(QString(filename));
+
+ if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsReading(fif)) {
+ dib = FreeImage_Load(fif, filename, 0);
+- } else {
+- qDebug() << "获得图片格式失败或不支持此格式图片的读取";
+- }
+- if (dib != NULL) {
+- /* 将FIBITMAP转换成mat */
+- mat = FI2MAT(dib);
++ if (dib != NULL) {
++ mat = FI2MAT(dib);
++ }
+ FreeImage_Unload(dib);
+ } else {
+ qDebug() << "图像加载失败";
diff -Nru kylin-photo-viewer-1.3.0.3/debian/patches/0018-149-fix-issue-IBH0OI.patch kylin-photo-viewer-1.3.0.3/debian/patches/0018-149-fix-issue-IBH0OI.patch
--- kylin-photo-viewer-1.3.0.3/debian/patches/0018-149-fix-issue-IBH0OI.patch 1970-01-01 08:00:00.000000000 +0800
+++ kylin-photo-viewer-1.3.0.3/debian/patches/0018-149-fix-issue-IBH0OI.patch 2025-01-13 16:48:07.000000000 +0800
@@ -0,0 +1,22 @@
+From: =?utf-8?b?6IuP6Iqz?= <sufang@kylinos.cn>
+Date: Tue, 14 Jan 2025 05:43:13 +0000
+Subject: =?utf-8?q?!149_fix_issue=3A=23IBH0OI_Merge_pull_request_!149_from_?=
+ =?utf-8?q?=E8=8B=8F=E8=8A=B3/openkylin/yangtze?=
+
+---
+ codec/kylinimagecodec/image_load/image_load.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/codec/kylinimagecodec/image_load/image_load.cpp b/codec/kylinimagecodec/image_load/image_load.cpp
+index 599a581..13863ad 100644
+--- a/codec/kylinimagecodec/image_load/image_load.cpp
++++ b/codec/kylinimagecodec/image_load/image_load.cpp
+@@ -94,6 +94,8 @@ MatResult KylinImageCodec::loadImageToMat(QString path, ImreadModes modes, QStri
+ mat = Mat(image.height(), image.width(), CV_8UC3, const_cast<uchar *>(image.bits()),
+ static_cast<size_t>(image.bytesPerLine()))
+ .clone();
++ } else if (suffix == "jpeg") {
++ mat = imread(path.toLocal8Bit().data(), IMREAD_COLOR);
+ } else {
+ mat = loadFreeimageFormat(path.toLocal8Bit().data());
+ }
diff -Nru kylin-photo-viewer-1.3.0.3/debian/patches/series kylin-photo-viewer-1.3.0.3/debian/patches/series
--- kylin-photo-viewer-1.3.0.3/debian/patches/series 2024-04-16 09:47:42.000000000 +0800
+++ kylin-photo-viewer-1.3.0.3/debian/patches/series 2025-01-13 16:48:07.000000000 +0800
@@ -14,3 +14,5 @@
0014-24-Fix-issues-I8BGMS-and-New-demand-21938.patch
0015-35-Fix-issues-I8C0V7-I8C0W0.patch
0016-53.patch
+0017-133-fix-bug-239870.patch
+0018-149-fix-issue-IBH0OI.patch