From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Tue, 25 Feb 2014 13:33:43 +0000 (+0000)
Subject: [trunk] Import commit 8ec8321df613986e8642e2975f7182072eb4be62 from ghostpdl
X-Git-Tag: version.2.0.1~4^2~244
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6145c8280478c84658982d110dbc72fff4979e0d;p=openjpeg

[trunk] Import commit 8ec8321df613986e8642e2975f7182072eb4be62 from ghostpdl

make opj_stream_set_user_data accept a NULL stream
for consistency with opj_stream_set_* which does so.

Update issue 225
---

diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c
index 8fce9812..062627f0 100644
--- a/src/lib/openjp2/cio.c
+++ b/src/lib/openjp2/cio.c
@@ -256,12 +256,16 @@ void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_strea
 void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
 {
 	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+	if (!l_stream)
+		return;
 	l_stream->m_user_data = p_data;
 }
 
 void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length)
 {
 	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+	if (!l_stream)
+		return;
 	l_stream->m_user_data_length = data_length;
 }