[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] /: update internal Libraw to last stable 0.18.13
From:       Human Dynamo <null () kde ! org>
Date:       2018-07-01 4:12:08
Message-ID: E1fZTia-0007r7-U6 () code ! kde ! org
[Download RAW message or body]

Git commit 06880c2aea63054adcfb423bd1a99d30ab6b8272 by Human Dynamo.
Committed on 01/07/2018 at 04:11.
Pushed by cgilles into branch 'master'.

update internal Libraw to last stable 0.18.13

M  +1    -1    NEWS
M  +6    -0    core/libs/rawengine/libraw/Changelog.txt
M  +9    -4    core/libs/rawengine/libraw/internal/dcraw_common.cpp
M  +1    -1    core/libs/rawengine/libraw/libraw/libraw_version.h

https://commits.kde.org/digikam/06880c2aea63054adcfb423bd1a99d30ab6b8272

diff --git a/NEWS b/NEWS
index 750590baa3..9b9d248d5f 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Database     : New video metadata parser based on ffmpeg to populate database.
 Search       : Add video support to find files based on properties registered on database.
 
 General      : Add QWebEngine support.
-General      : Update internal Libraw to last 0.18.12.
+General      : Update internal Libraw to last 0.18.13.
 General      : Fix all Krazy static analyzer reports.
 
 Tags         : Add possibility to merge tags by drag & drop.
diff --git a/core/libs/rawengine/libraw/Changelog.txt b/core/libs/rawengine/libraw/Changelog.txt
index 3252264fac..b6377721a9 100644
--- a/core/libs/rawengine/libraw/Changelog.txt
+++ b/core/libs/rawengine/libraw/Changelog.txt
@@ -1,3 +1,9 @@
+2018-06-28  Alex Tutubalin <lexa@lexa.ru>
+ * changed wrong fix for Canon D30 white balance
+ * fixed possible stack overrun while reading zero-sized strings
+ * fixed possible integer overflow
+ * LibRaw 0.18.13
+
 2018-05-11  Alex Tutubalin <lexa@lexa.ru>
  * Secunia Advisory SA83507, credits Kasper Leigh Haabb,
    Secunia Research at Flexera
diff --git a/core/libs/rawengine/libraw/internal/dcraw_common.cpp b/core/libs/rawengine/libraw/internal/dcraw_common.cpp
index 221d2473f2..bac101358f 100644
--- a/core/libs/rawengine/libraw/internal/dcraw_common.cpp
+++ b/core/libs/rawengine/libraw/internal/dcraw_common.cpp
@@ -62,9 +62,14 @@ static size_t local_strnlen(const char *s, size_t n)
 #ifdef LIBRAW_LIBRARY_BUILD
 static int stread(char *buf, size_t len, LibRaw_abstract_datastream *fp)
 {
- int r = fp->read(buf,len,1);
- buf[len-1] = 0;
- return r;
+  if(len>0)
+  {
+    int r = fp->read(buf, len, 1);
+    buf[len - 1] = 0;
+    return r;
+  }
+  else
+    return 0;
 }
 #define stmread(buf,maxlen,fp) stread(buf,MIN(maxlen,sizeof(buf)),fp)
 #endif
@@ -11943,7 +11948,7 @@ void CLASS parse_ciff (int offset, int length, int depth)
         FORC4
         {
           ushort q = get2();
-          cam_mul[c ^ (c >> 1)] = q? 1024.0 / get2() : 1024;
+          cam_mul[c ^ (c >> 1)] = 1024.0/ MAX(1,q);
         }
 	if (!wbi) cam_mul[0] = -1;	/* use my auto white balance */
       } else if (!cam_mul[0]) {
diff --git a/core/libs/rawengine/libraw/libraw/libraw_version.h b/core/libs/rawengine/libraw/libraw/libraw_version.h
index 6507a85bda..a114ba6c2d 100644
--- a/core/libs/rawengine/libraw/libraw/libraw_version.h
+++ b/core/libs/rawengine/libraw/libraw/libraw_version.h
@@ -22,7 +22,7 @@ it under the terms of the one of two licenses as you choose:
 
 #define LIBRAW_MAJOR_VERSION  0
 #define LIBRAW_MINOR_VERSION  18
-#define LIBRAW_PATCH_VERSION  12
+#define LIBRAW_PATCH_VERSION  13
 #define LIBRAW_VERSION_TAIL   Release
 
 #define LIBRAW_SHLIB_CURRENT  	16
[prev in list] [next in list] [prev in thread] [next in thread]