parent
c891cc011f
commit
751d837d20
@ -1 +1 @@
|
|||||||
0b425d9a5ed873adeeb68ea1b4945745f3ec1507 SOURCES/0.20.2.tar.gz
|
01ca6bfca570ffd4633e6416cc478e247d203367 SOURCES/LibRaw-0.21.3.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
SOURCES/0.20.2.tar.gz
|
SOURCES/LibRaw-0.21.3.tar.gz
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
From fa329f37dca4a2c938f8abb50ee4a7ef93e64fbb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alex Tutubalin <lexa@lexa.ru>
|
|
||||||
Date: Mon, 12 Apr 2021 13:21:52 +0300
|
|
||||||
Subject: [PATCH] check for input buffer size on datastream::gets
|
|
||||||
|
|
||||||
---
|
|
||||||
src/libraw_datastream.cpp | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/libraw_datastream.cpp b/src/libraw_datastream.cpp
|
|
||||||
index 606e5de73618..7e95bc749688 100644
|
|
||||||
--- a/src/libraw_datastream.cpp
|
|
||||||
+++ b/src/libraw_datastream.cpp
|
|
||||||
@@ -286,6 +286,7 @@ INT64 LibRaw_file_datastream::tell()
|
|
||||||
|
|
||||||
char *LibRaw_file_datastream::gets(char *str, int sz)
|
|
||||||
{
|
|
||||||
+ if(sz<1) return NULL;
|
|
||||||
LR_STREAM_CHK();
|
|
||||||
std::istream is(f.get());
|
|
||||||
is.getline(str, sz);
|
|
||||||
@@ -417,6 +418,7 @@ INT64 LibRaw_buffer_datastream::tell()
|
|
||||||
|
|
||||||
char *LibRaw_buffer_datastream::gets(char *s, int sz)
|
|
||||||
{
|
|
||||||
+ if(sz<1) return NULL;
|
|
||||||
unsigned char *psrc, *pdest, *str;
|
|
||||||
str = (unsigned char *)s;
|
|
||||||
psrc = buf + streampos;
|
|
||||||
@@ -609,6 +611,7 @@ INT64 LibRaw_bigfile_datastream::tell()
|
|
||||||
|
|
||||||
char *LibRaw_bigfile_datastream::gets(char *str, int sz)
|
|
||||||
{
|
|
||||||
+ if(sz<1) return NULL;
|
|
||||||
LR_BF_CHK();
|
|
||||||
return fgets(str, sz, f);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
@ -1,26 +1,25 @@
|
|||||||
--- LibRaw-0.20-Beta1/libraw.pc.in~ 2020-05-13 14:22:12.656424311 +0200
|
--- LibRaw-0.21.0/libraw.pc.in~ 2022-12-18 01:26:41.000000000 -0600
|
||||||
+++ LibRaw-0.20-Beta1/libraw.pc.in 2020-05-13 14:22:27.481441569 +0200
|
+++ LibRaw-0.21.0/libraw.pc.in 2022-12-19 10:27:02.793929537 -0600
|
||||||
@@ -5,7 +5,8 @@
|
@@ -6,7 +6,9 @@
|
||||||
|
|
||||||
Name: libraw
|
Name: libraw
|
||||||
Description: Raw image decoder library (non-thread-safe)
|
Description: Raw image decoder library (non-thread-safe)
|
||||||
-Requires: @PACKAGE_REQUIRES@
|
Requires: @PACKAGE_REQUIRES@
|
||||||
+Requires.private: @PACKAGE_REQUIRES@
|
+Requires.private: @PACKAGE_REQUIRES@
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
|
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
|
||||||
+Libs: -L${libdir} -lraw@PC_OPENMP@
|
+Libs: -L${libdir} -lraw@PC_OPENMP@
|
||||||
+Libs.private: -lstdc++
|
+Libs.private: -lstdc++
|
||||||
|
Libs.private: @PACKAGE_LIBS_PRIVATE@
|
||||||
Cflags: -I${includedir}/libraw -I${includedir}
|
Cflags: -I${includedir}/libraw -I${includedir}
|
||||||
--- LibRaw-0.20-Beta1/libraw_r.pc.in~ 2020-05-13 14:22:18.034430572 +0200
|
--- LibRaw-0.21.0/libraw_r.pc.in~ 2022-12-18 01:26:41.000000000 -0600
|
||||||
+++ LibRaw-0.20-Beta1/libraw_r.pc.in 2020-05-13 14:22:27.481441569 +0200
|
+++ LibRaw-0.21.0/libraw_r.pc.in 2022-12-19 10:28:30.620571338 -0600
|
||||||
@@ -5,7 +5,8 @@
|
@@ -6,7 +6,8 @@
|
||||||
|
|
||||||
Name: libraw
|
Name: libraw
|
||||||
Description: Raw image decoder library (thread-safe)
|
Description: Raw image decoder library (thread-safe)
|
||||||
-Requires: @PACKAGE_REQUIRES@
|
Requires: @PACKAGE_REQUIRES@
|
||||||
+Requires.private: @PACKAGE_REQUIRES@
|
+Requires.private: @PACKAGE_REQUIRES@
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
|
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
|
||||||
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
|
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
|
||||||
+Libs.private: -lstdc++
|
Libs.private: @PACKAGE_LIBS_PRIVATE@
|
||||||
Cflags: -I${includedir}/libraw -I${includedir}
|
Cflags: -I${includedir}/libraw -I${includedir}
|
||||||
|
Loading…
Reference in new issue