Merge pull request #1979 from postscript-dev/fix_exiv2_sample_thumb_stdout

Add exiv2 extract thumb to stdout (#1934)

Author: kevinbackhouse

src/actions.cpp

@@ -950,6 +950,13 @@ namespace Action {
  std::cerr << path_ << ": " << _("Image does not contain an Exif thumbnail\n");
  }
  else {
+ if ( (Params::instance().target_ & Params::ctStdInOut) != 0 ) {
+ Exiv2::DataBuf buf = exifThumb.copy();
+ std::cout.write(reinterpret_cast<char*>(buf.data()),
+ buf.size());
+ return 0;
+ }
+
  std::string thumb = newFilePath(path_, "-thumb");
  std::string thumbPath = thumb + thumbExt;
  if (dontOverwrite(thumbPath)) return 0;

test/data/issue_1934_poc1-thumb.jpg

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+from system_tests import CaseMeta, path, CopyTmpFiles, check_no_ASAN_UBSAN_errors
+
+@CopyTmpFiles("$data_path/issue_1934_poc1.exv")
+class TestExiv2ExtractThumbnailToStdout(metaclass=CaseMeta):
+ """
+ Regression test for 'extracting a thumbnail to stdout' bug described in:
+ https://github.com/Exiv2/exiv2/issues/1934
+ """
+ url = "https://github.com/Exiv2/exiv2/issues/1934"
+
+ filename1 = path("$tmp_path/issue_1934_poc1.exv")
+ filename2 = path("$tmp_path/issue_1934_poc1-thumb.jpg")
+ filename3 = path("$data_path/issue_1934_poc1-thumb.jpg")
+ commands = ["$exiv2 --force --extract t- $filename1 > $filename2",
+ "cmp $filename2 $filename3"
+ ]
+ stderr = [""]*2
+ retval = [0]*2
+
+ compare_stdout = check_no_ASAN_UBSAN_errors
+