Merge branch 'tizen_4.0' into tizen_5.0 86/197786/1 submit/tizen_5.0/20190117.055245
authorPiotr Kosko/Native/Web API (SWP) /SRPOL/Professional/삼성전자 <p.kosko@samsung.com>
Wed, 16 Jan 2019 09:39:59 +0000 (10:39 +0100)
committerPiotr Kosko/Native/Web API (SWP) /SRPOL/Professional/삼성전자 <p.kosko@samsung.com>
Wed, 16 Jan 2019 09:39:59 +0000 (10:39 +0100)
Change-Id: Icf1b978d0b5a6dea865fe10426e51ed79fe0d7ae

1  2 
packaging/webapi-plugins.spec
src/archive/zip_add_request.cc
src/exif/jpeg_file.cc

@@@ -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
Simple merge
@@@ -161,8 -161,13 +161,13 @@@ PlatformResult JpegFile::load(const std
    }
  
    const std::size_t in_file_size = static_cast<size_t>(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()));