00f32316b2
Add missing header
8 years ago
14ff034fb4
Catch std::overflow_error exception in Print::run
8 years ago
d09c4bb7cd
Fix arithmetic operation overflow
8 years ago
a1023c39ab
Add safe_op.hpp to LIBEXIV2_PRIVATE_HDR (to be shown in IDEs)
8 years ago
7c00e9128d
Fix compilation error with gcc < 5
...
- overflow builtins were added with gcc 5.0
8 years ago
ca7c699aa1
Added overflow safe addition function
8 years ago
8f5b795eaa
Fixes to autotools build to respect mn_int.cpp files ( #186 )
...
* Fixes to autotools build to respect mn_int.cpp files
* Changes following Luis' code review.
8 years ago
f36bea3801
exiv2::getEnv throws std::out_of_range on unexpected EnVar
...
This change define explicitly the behavior that exiv2::getEnv should have
on response to unexpected inputs.
There are some other minor changes:
- Use _putenv_s for the unit tests on Windows
- Add todo comment
- Remove deprecated note about freeing memory
8 years ago
8dc3c1f0a0
Replace malloc/free by new/delete. Use const char* for input arg
8 years ago
bfe057ca20
Auto-formatting done by the IDE while touching code in the previous commits
8 years ago
8b049922d7
Change exiv2::urlencode signature to return std::string
...
The goal of this change is to remove the responsibility from the client code to
free the memory of the returned string.
8 years ago
8c010c903b
Compile private part as an OBJECT library (CMake concept)
8 years ago
d3748152a7
add _int suffix to all the internal files
8 years ago
44fc9ec528
Move Cr2Header to a new .cpp file
8 years ago
d48abab718
Apply clang-format to some lines of the file canonmn.cpp
8 years ago
d0a1c6d19d
Apply clang-format to bmpimage.cpp
8 years ago
2efc2e79da
Remove obsolete id
8 years ago
5b5987a596
Remove obsolete EXIV2_RCSID
8 years ago
5df8b01b77
Remove obsolete svn revision
8 years ago
e96e0daa8a
Jp2Image::printStructure: Corrected used DataBuf for output
8 years ago
befe8c64e3
Jp2Image::printStructure: only print output when bPrint is set
8 years ago
13db7fdec2
Formatting changes
8 years ago
87a83c89d5
Merge branch 'master' into stringFormat_update
8 years ago
1fe8d5ba7f
Fix conversion issue detected by MSVC
8 years ago
36df4bc997
Fixed potential out of bounds file access
...
This commit adds a out-of-bounds protection in the case that the
extracted values for offset & count are summed up larger than the size
of the file. Also this function checks for overflows before performing
the addition.
This fixes #159
8 years ago
cfa5073a2c
Added short explanation to internal function stringFormat
8 years ago
06cafadf4f
Added assertion that call to vsnprintf succeeds
8 years ago
c0ea5f4fba
Rewrite the reallocation the C++ way
...
* Fix handling of the return value of vsnprintf
* In C++11 we could use buffer.data instead of &buffer[0]
8 years ago
22dbd632bb
Find single character
8 years ago
d1f73aa237
Make it floats
8 years ago
849f416771
Avoid self-assignment
8 years ago
867343b46f
Utilize const Value reference
8 years ago
fd64d53e4b
Remove superfluous variable declarations
8 years ago
d7297a2c2c
Pass argument as constant reference
8 years ago
4ad4323685
Add new CMake options to use compiler flags to detect issues in the code (Gcc, Clang & MSVC)
8 years ago
57883ee664
Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF
8 years ago
c686843e20
Added exception throw on Value pointer being null
...
v can be null if the typeId is invalid => throw an exception notifying
the user that his file is corrupted instead of the assertion
8 years ago
75940da0a6
Added check for overflows in calculation of size
8 years ago
8a586c74bb
Fix for CVE-2017-14864, CVE-2017-14862 and CVE-2017-14859
...
The invalid memory dereference in
Exiv2::getULong()/Exiv2::StringValueBase::read()/Exiv2::DataValue::read()
is caused further up the call-stack, by
v->read(pData, size, byteOrder) in TiffReader::readTiffEntry()
passing an invalid pData pointer (pData points outside of the Tiff
file). pData can be set out of bounds in the (size > 4) branch where
baseOffset() and offset are added to pData_ without checking whether
the result is still in the file. As offset comes from an untrusted
source, an attacker can craft an arbitrarily large offset into the
file.
This commit adds a check into the problematic branch, whether the
result of the addition would be out of bounds of the Tiff
file. Furthermore the whole operation is checked for possible
overflows.
8 years ago
6c1ba331b9
Added arithmetic operation overflow error
8 years ago
ff18fec24b
Fix for CVE-2017-14860
...
A heap buffer overflow could occur in memcpy when icc.size_ is larger
than data.size_ - pad, as then memcpy would read out of bounds of data.
This commit adds a sanity check to iccLength (= icc.size_): if it is
larger than data.size_ - pad (i.e. an overflow would be caused) an
exception is thrown.
This fixes #71 .
8 years ago
65f45a3505
Added new error message to warn about corrupted metadata
8 years ago
4beb08e219
Merge pull request #105 from Kicer86/bigtiff
...
Work in progress - improvements for bigtiff
8 years ago
8e4aff29c2
Merge pull request #107 from D4N/tiffvisitor_nullptr_check
...
Use nullptr check instead of assertion, by Raphaël Hertzog
8 years ago
2402a693fd
adding missing include for numeric_limits
8 years ago
93bbf0cab1
Merge pull request #104 from piponazo/removeCpp11Feature
...
Remove cpp11 features
8 years ago
e026160556
Use nullptr check instead of assertion, by Raphaël Hertzog
...
Source:
https://github.com/Exiv2/exiv2/issues/57#issuecomment-333086302
tc can be a null pointer when the TIFF tag is unknown (the factory
then returns an auto_ptr(0)) => as this can happen for corrupted
files, an explicit check should be used because an assertion can be
turned of in release mode (with NDEBUG defined)
This also fixes #57
8 years ago
bef6dad6c5
Merge pull request #103 from AdelieLinux/master
...
Amend fix for #9 to apply to other Unix systems
8 years ago
b1a5d615c5
removing debug message
8 years ago
64e05c0a7a
improving fixes for #55 and #56
8 years ago
1a1a61b63d
Remove reference to regex & c++11 from the man page
8 years ago
5b8894908b
Remove all references to EXV_HAVE_REGEX and related code
8 years ago
bfd61bd0f1
Merge pull request #96 from Kicer86/master
...
Adding comment for issue #56
8 years ago
d775683f57
Amend fix for #9 to apply to other Unix systems
...
At least the musl libc on Linux has the same issue as Mac OS X: the
PTHREAD_RECURSIVE_* static initialiser does not exist. This is a
documented and purposeful omission:
http://www.openwall.com/lists/musl/2017/02/20/3
This commit uses similar logic to the Apple test on other Unixes.
8 years ago
2784b1f7f7
Remove EXIV2_ENABLE_LIBXMP variable, always build static XMP library, remove cmake OBJECT library
8 years ago
7e90668011
Adding comment for issue #56
8 years ago
df3c77516c
Merge pull request #94 from piponazo/configFileInBuildDirectory
...
Generate exv_conf.h file out of the source tree.
8 years ago
a9e3f17f31
Generate exv_conf.h file out of the source tree. Install it in the include folder.
8 years ago
686edde5ef
Provide exiv2Config file automatically generated by CMake
8 years ago
327b3f6c4d
Fix https://github.com/Exiv2/exiv2/issues/83
8 years ago
2f0104879a
Merge pull request #81 from piponazo/robinChanges
...
Robin changes
8 years ago
d43cd82002
Fix #80
8 years ago
8ad49f6d73
Robin changes in sync with master changes
8 years ago
74cb5bab13
Fixed wrong brackets: size*count + pad can overflow before the cast
...
=> Should fix #76 (most of the work has been done by Robin Mills in
6e3855aed7#76 is the contents of the 26th IFD, with the
following contents:
tag: 0x8649
type: 0x1
count: 0xffff ffff
offset: 0x4974
The issue is the size of count (uint32_t), as adding anything to it
causes an overflow. Especially the expression:
(size*count + pad+20)
results in an overflow and gives 20 as a result instead of
0x100000014, thus the condition in the if in the next line is false
and the program continues to run (until it crashes at io.read).
To properly account for the overflow, the brackets have to be removed,
as then the result is saved in the correctly sized type and not cast
after being calculated in the smaller type.
The brackets have also been removed from bigtiffimage.cpp, where the
same issue is present.
8 years ago
d8ae4484ae
msvc support for bigtiffimage.cpp
8 years ago
e1948c7ff9
msvc/bigtiffimage support
8 years ago
6e3855aed7
Fix https://github.com/Exiv2/exiv2/issues/55
8 years ago
197375dfa4
Merge pull request #72 from Kicer86/bigtiff
...
Some improvements, crash fix.
8 years ago
9acc1c56a7
adding ifd8 and long longs to is8ByteType()
8 years ago
4837d8cf58
changing header + some warning fix
8 years ago
6fd0bc9e10
Adding ./configure support for bigtiffimage.cpp
8 years ago
678e2b8517
Explicitly list files to be processed CMake generated builds [remove file(GLOB...)]
8 years ago
734a2c3d57
fixing TODO
8 years ago
e3ff1ba694
fixing indent
8 years ago
4629227358
fix for IPTCNAA
...
dir_offset was used instead of offset
8 years ago
4f6f5b4946
removing conditional_byte_swap* functions
8 years ago
b6e79357de
Adding 8-byte swap functions + consts
8 years ago
f96d84ba8c
dropping dead code
8 years ago
50ecf672b5
using Internal::indent()
8 years ago
f8ac7a5dc3
renaming Tiff to StandardTiff
8 years ago
d460bbdb3f
fix for standard tiff case
8 years ago
81aa8828e0
applying dff941ad7f
8 years ago
874daede53
fixing broken print for 'offset' column
8 years ago
8b07982bf2
variable names cleanup
8 years ago
1a1dc3afd4
simplifying code
8 years ago
c6cbf69c49
first attempt to read both - standard and big tiff
8 years ago
972e302cba
some cleanups
8 years ago
3c9817339a
Dropping BasicIo& io parameter.
...
We already have acces to it via Image class
8 years ago
65722a0020
dropping bSwap parameter
...
Member is better.
8 years ago
7e291ef226
Encapsulating Header's members
8 years ago
cb3857c675
removing useles code
8 years ago
ff21b5a962
restore position if necessary
8 years ago
cc8c470620
fix header read + tag name dump
8 years ago
5ab1a0809d
adopt to style
8 years ago
5fa328737a
moving implementation from stand alone parser
8 years ago
c008ad2403
making tag related functions private
8 years ago
307faae830
introducing tiff Header + header builder function
8 years ago
ab27bfab3c
introducing getULongLong()
8 years ago
dc331ee44a
implementing isBigTiffType
8 years ago
b3aa2adf31
initial implementation of newBigTiffInstance()
8 years ago
bc6eed0b03
registering new file type
8 years ago
97d7a04ea8
Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'.
...
But there is no distinction between the F004 and the F017 Versions of the 90mm.
Fixed Bug #1306 and #1304 (partly)
8 years ago
f9d0be42b5
Merge pull request #69 from marisn/master
...
Fix crash on undefined metadata on some Nikon images
8 years ago
21ac4ac61a
Test suite changes due to https://github.com/Exiv2/exiv2/pull/68
8 years ago
591dea579a
Fix crash on undefined metadata on some Nikon images.
...
Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115
8 years ago
dff941ad7f
Do not print offset when it is used as tag's value
8 years ago
22aaff8682
Fix cmakeBuild.cmd --static to use zlibstatic.lib
8 years ago
d366943297
Refactoring EXV_USE_CURL and EXV_USE_SSH
8 years ago
012d630125
Polish options. Move exv_conf.h to directory include/exiv2
8 years ago
0ed456ca4d
Use CMAKE_DL_LIBS instead of dl
...
cmake provides a wrapper to link against 'dl' which evalutes to nothing on FreeBSD and to dl on Linux for example.
https://cmake.org/cmake/help/v3.6/variable/CMAKE_DL_LIBS.html
8 years ago
5405d61623
Fix http://dev.exiv2.org/issues/1305
8 years ago
2828b11cf7
Build changes to support EXV_HAVE_REGEX and EXV_HAVE_REGEX_H
8 years ago
ddbbbc7653
attempt to determine lens name from in:value object (represents lensID) when in:metadata == NULL
8 years ago
60d436c969
Many changes to CMakeLists.txt and cmakeBuild.cmd to support unicode, static linking, passing shared library build flags.
8 years ago
68d2c49fc5
Fix typo
8 years ago
1af1ce0229
Fix CMake + Conan integration on Windows
8 years ago
960335faea
Use conan in travis
8 years ago
2221a5c630
Make CMake code work with conan
8 years ago
9586164a8f
Fix: https://github.com/Exiv2/exiv2/issues/45 Thank You to Steve for reporting, providing the patch and giving feedback that modifying ~/.exiv2 worked.
8 years ago
dc79df8ee6
Only use CURL and SSH when their support is enabled
8 years ago
c2350a3cb9
Make CMake code work with conan
8 years ago
20582a93c6
Marking members in a proper way.
8 years ago
4e25435afb
Changing return type of Image::tagName to std::string
8 years ago
ddb87fe0cf
Moving static tagName() into Image class to prevent multithread crashes.
...
static variables inside of tagName() were not protected against multithread access.
It could cause a crash in case of simultaneous initialization of map of tags.
8 years ago
0f72599121
https://github.com/Exiv2/exiv2/issues/45 Fixing blank line typo.
8 years ago
cf36ff3372
Fix: https://github.com/Exiv2/exiv2/issues/45 Thank You to Steve for reporting, providing the patch and giving feedback that modifying ~/.exiv2 worked.
8 years ago
9761f0ee1f
ICONV include directories only used by exiv2lib
8 years ago
31a51fda8a
Replace EXIV2_ENABLE_SHARED by BUILD_SHARED_LIBS. Also use EXV_HAVE_DLL only for the exiv2lib target
8 years ago
426cb8f354
Fix Visual Studio build breaker.
8 years ago
b5cac373b1
Merge pull request #39 from Exiv2/autotoolsMacLink
...
./configure --with-adobe[=2016|2014|2013] for MacOSX
8 years ago
a768b85191
Lowercase target_link_libraries
8 years ago
20c7ad6c59
Lowercase include{,_directories}
8 years ago
1fc319c0e4
Lowercase add_custom_target, configure_file, install macros
8 years ago
40565761d1
Lowercase add_{definitions,subdirectory}, set{_*} and option macros
8 years ago
06b20523f7
Lowercase if/else/endif/foreach/endforeach
8 years ago
573b2cfcd2
XMPsdk fixes. 2013 and 2016 build and (mostly) pass the test suite.
8 years ago
95c5e92365
Support for Adobe XMPsdk 2013. Build xmpsdk using Adobe scripts.
8 years ago
50fad7327c
Merge pull request #33 from a17r/localedirundefined
...
LOCALEDIR is used by EXIV2_ENABLE_BUILD_PO so make sure it is defined
8 years ago
90e8ad8a72
Only set CMAKE_RUNTIME_OUTPUT_DIRECTORY once
8 years ago
3a45a375d8
Simplify CMake code related with PNG and ZLIB (ZLib is required is PNG=ON)
8 years ago
c735bc5ae2
Relative paths to current directory
8 years ago
6a00d4b282
Move code from CMake_msvc.txt to config/compilerFlags.cmake
8 years ago
a2bb29011d
Move compiler flags configuration to a new file (config/compilerFlags.cmake).
...
Also define the PSAPI_VERSION only for the exiv2lib target (It's not needed for the rest of targets)
8 years ago
3736707015
Merge branch 'master' into localedirundefined
8 years ago
a8e55c4d9e
Drop LOCALEDIR, use CMAKE_INSTALL_LOCALEDIR directly
...
It is always properly defined by GNUInstallDirs. Otherwise it was
possible to install translations in / if EXIV2_ENABLE_NLS=OFF.
Thanks-to: Luis Díaz Más
8 years ago
b81f493024
Add option to disable tools (currently exiv2 binary)
...
In a multiarch build, one may want to build binaries only for native arch.
8 years ago
aa6374b202
Use more GNUInstallDirs
...
Conveniently fixes multiarch install dir issues.
8 years ago
c415e7f509
Fix CMake configuration when XMP is disabled. Check XMP variable instead LIBXMP
8 years ago
afba52e042
Remove include tags_int.hpp from include/exiv2/*video.hpp files
8 years ago
35c3e31958
Fixes for MSVC case
8 years ago
27cde135d9
Remove more useless include_directories
8 years ago
93e603e031
Fix linking problems with pthreads
8 years ago
9808c3bf2d
Simplify CMake code to identify FreeBSD systems
8 years ago
f5f5826c03
Use target_sources to extend the list of sources in exceptional situations
8 years ago
45807ca03d
Do not include SSH and CURL include dirs globally. Do it properly for the exiv2lib target
8 years ago
c50702612d
Simplify CMake code for handling SSH and CURL cases
8 years ago
57cd78b517
Put all the CMake related with the exiv app together
8 years ago
ee61c24459
Remove inclusion of many useless include_directories
8 years ago
1c03767391
Move inclusion of private header from .hpp to .cpp (not needed in the .hpp)
8 years ago
73f53cc6f9
Move sample applications from src/CMakeLists.txt to samples/CMakeLists.txt
8 years ago
aefa3e3d34
MacOSX --with-adobe link issue. Work in progress. Code and documentation update.
8 years ago
2a61392766
Merge pull request #27 from piponazo/master-CMakeObjectLibraryForXmp
...
New way to generate the XMP library (Using the CMake OBJECT LIBRARY concept)
8 years ago
b387d58507
Remove EXPAT_LIBRARIES from where it is not needed (already inherited from exiv2lib target)
8 years ago
40d10639e2
Reuse XMP OBJECT library in the exiv2lib when EXIV2_ENABLE_LIBXMP=OFF
8 years ago
935421c855
Refactoring autotools to support ADOBE_XMPSDK (Work in Progress)
8 years ago
64bbe802e2
Install exv_conf.h properly
8 years ago
b4a2b822c2
Remove usage of global variable INSTALL_TARGET_STANDARD_ARGS. Specify install destinitions in each target
8 years ago
2e816165ea
Changes to autotools to support C++11 (work in progress)
8 years ago
b6885c8028
Since we are requiring CMake 3.1 we can remove the usage of PRIVATE_VAR and use directly PRIVATE or PUBLIC
8 years ago
e2862ba764
#1300 and #1301 (583cfd6e and 3bbba3f8). These fixes were accidentally lost on 2017-08-07.
8 years ago
1505b4c3aa
#11 Integrating fix into master (accidentally lost on 2017-08-07 by rebase -force)
8 years ago
122cd5737f
Cosmetic modifications to Pull-21. Fix to ensure Cygwin uses #include <unistd.h>
8 years ago
8592c10a3e
Merge pull request #21 from piponazo/configFileFromCMake
...
New way to generate the include/exiv2/exv_conf.h file
8 years ago
e474b0fbd3
localtime.c and getopt_win32.c added unconditionally for the exiv2 app
8 years ago
011f2b5259
Fixing bug in test harness on Linux.
8 years ago
22efdffd1d
Use #ifdef instead of #if for EXV_HAVE_REGEX
8 years ago
252d738b6c
Include xmpsdk/include only in the needed target. Remove other uneeded usages of INCLUDE_DIRECTORIES and LINK_DIRECTORIES
8 years ago
1d327fba21
Correct usage of HAVE_REGEX
8 years ago
911832d70a
Handle HAVE_TIMEGM variable in the new cmake file
8 years ago
5c78c82f20
Handle ENABLE_WEBREADY variable in the new cmake file
8 years ago
93835cd680
Handle correctly ENABLE_VIDEO the config.h.cmake file
8 years ago
bba3cbb7fd
Remove unused definition EXV_HAVE_DECL_STRERROR_R
8 years ago
24130dbbb2
Cast to avoid compiler warning with MSVC2005
8 years ago
882c825f1a
Fix https://github.com/Exiv2/exiv2/issues/16
8 years ago
b35903e4c8
Spelling error
...
Small error in camera name ICLA-68 instead of ILCA-68
8 years ago
b8bbacd196
Fix submitted. https://github.com/Exiv2/exiv2/issues/10
...
This is not a good fix because temporaryFile() is a bad idea and requires a lock to be thread safe. However, the lock is in the sample code and not in the library. I considered in v0.26 to rewrite this to use a temporary (MemIo) file and decided against that to save time. My sin. The correct fix usually requires less effort in the long run.
8 years ago
82dbe6199d
https://github.com/Exiv2/exiv2/issues/11 Closed. Coincidentally Raphael reported issues with Visual Studio 2015 Community Edition. Issue 11 and Raphael's issues should now be resolved.
8 years ago
620ef04e96
https://github.com/Exiv2/exiv2/issues/9 Fix submitted.
8 years ago
d3c2b99385
#1297 Fix submitted.
8 years ago
ef64de084c
Removing msvc2003 support
8 years ago
a9c9e8ff8e
Remove svn_version.h
8 years ago
290164d1b6
Work in progress: https://github.com/Exiv2/exiv2/issues/3
...
Tested on MacOS-X. I'll test Linux/Cygwin/MSVC and close if good.
8 years ago
8af901ce05
cmake: always depend on threads, not only in the xmp case
8 years ago
3af0d1a6b2
cmake: fix gettext support
...
Building exiv2 with uclibc and gettext fails currently as detected
by the buildroot autobuilders:
http://autobuild.buildroot.net/results/def/defcdd3dd57b031c31bb16c0075f079a482bf52d/build-end.log
8 years ago
2f8681e120
#1296 Fix submitted.
8 years ago
9be72eecec
#1294 Fix.
8 years ago
559ace375b
#1291 Reverting change in r4763 relating to windows.h as they break the Cygwin build. Retain changes in exiv2/exiv2.hpp and exv_msvc.h
8 years ago
f36cccefa2
#1291 include header simplification
8 years ago
73572aa54d
#1291 Fix submitted. Thank You to T Modes for reporting this issue.
8 years ago
44da4724b3
#1175 Correction to r4756 Another three casts required to build with Visual Studio (size_t code ripple)
8 years ago
Luis Díaz Más
Dan Čermák
Robin Mills
tbeu
Andreas Sturmlechner
Michał Walenciak
A. Wilcox
mfg92
Māris Nartišs
Tobias C. Berner
Ray
Luis Diaz Mas
kiekerjan
Bernd Kuhls