From 1619d3133abb2ae8beff65b1cf3e4ee9c281def1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 17 Nov 2015 10:17:47 +0000
Subject: Fix crash due to writing off the end of an Image's buffer; see
 comments.

---
 src/lib/image.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/image.h')

diff --git a/src/lib/image.h b/src/lib/image.h
index 2d267f861..416ee3a8d 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -39,7 +39,7 @@ class Socket;
 class Image
 {
 public:
-	Image (AVPixelFormat, dcp::Size, bool);
+	Image (AVPixelFormat, dcp::Size, bool, int extra_pixels = 0);
 	Image (AVFrame *);
 	Image (Image const &);
 	Image (boost::shared_ptr<const Image>, bool);
@@ -88,6 +88,7 @@ private:
 	int* _line_size; ///< array of sizes of the data in each line, in pixels (without any alignment padding bytes)
 	int* _stride; ///< array of strides for each line (including any alignment padding bytes)
 	bool _aligned;
+	int _extra_pixels;
 };
 
 extern PositionImage merge (std::list<PositionImage> images);
-- 
cgit v1.2.3