From: Piotr Kosko/Native/Web API (SWP) /SRPOL/Professional/삼성전자 Date: Wed, 16 Jan 2019 09:39:59 +0000 (+0100) Subject: Merge branch 'tizen_4.0' into tizen_5.0 X-Git-Tag: submit/tizen/20190116.121828^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1453a647ba5be36450703142a84ec9b0f750ab2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Merge branch 'tizen_4.0' into tizen_5.0 Change-Id: Icf1b978d0b5a6dea865fe10426e51ed79fe0d7ae --- c1453a647ba5be36450703142a84ec9b0f750ab2 diff --cc packaging/webapi-plugins.spec index 3f64fc7b,1b03c2b7..f9c75c68 --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@@ -8,7 -8,7 +8,7 @@@ %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions} Name: webapi-plugins - Version: 2.36 -Version: 2.31 ++Version: 2.37 Release: 0 License: Apache-2.0 and BSD-3-Clause and MIT Group: Development/Libraries diff --cc src/exif/jpeg_file.cc index 961167d5,5fe598dc..8c5e4746 --- a/src/exif/jpeg_file.cc +++ b/src/exif/jpeg_file.cc @@@ -161,8 -161,13 +161,13 @@@ PlatformResult JpegFile::load(const std } const std::size_t in_file_size = static_cast(ftell_val); - fseek(m_in_file, 0, SEEK_SET); + res = fseek(m_in_file, 0, SEEK_SET); + if (0 != res) { + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Reading JPEG file failed", + ("fseek failed with error! [%d]", res)); + } + - LoggerD("JPEG file: [%s] size:%d", path.c_str(), in_file_size); + LoggerD("JPEG file: [%s] size: %zu", path.c_str(), in_file_size); if (0 == in_file_size) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "JPEG file is invalid", ("Input file [%s] is empty!", path.c_str()));