eb44a52c7c
security fix: CVE-2008-0225 - heap-based buffer overflow in libreal (RTSP) also incorporates post release bug fix in WMV decoding from brad, thanks
36 lines
1.7 KiB
Plaintext
36 lines
1.7 KiB
Plaintext
$OpenBSD: patch-src_input_input_file_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $
|
|
--- src/input/input_file.c.orig Tue Jan 1 08:30:08 2008
|
|
+++ src/input/input_file.c Wed Jan 9 01:58:02 2008
|
|
@@ -200,7 +200,7 @@ static buf_element_t *file_plugin_read_block (input_pl
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|
|
_("input_file: read error (%s)\n"), strerror(errno));
|
|
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
|
- this->mrl, NULL);
|
|
+ this->mrl, (char *)NULL);
|
|
}
|
|
buf->free_buffer (buf);
|
|
buf = NULL;
|
|
@@ -356,11 +356,11 @@ static int file_plugin_open (input_plugin_t *this_gen
|
|
|
|
if (this->fh == -1) {
|
|
if (errno == EACCES) {
|
|
- _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL);
|
|
+ _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, (char *)NULL);
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|
|
_("input_file: Permission denied: >%s<\n"), this->mrl);
|
|
} else if (errno == ENOENT) {
|
|
- _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, NULL);
|
|
+ _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, this->mrl, (char *)NULL);
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|
|
_("input_file: File not found: >%s<\n"), this->mrl);
|
|
}
|
|
@@ -397,7 +397,7 @@ static int file_plugin_open (input_plugin_t *this_gen
|
|
#endif
|
|
|
|
if (file_plugin_get_length (this_gen) == 0) {
|
|
- _x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, NULL);
|
|
+ _x_message(this->stream, XINE_MSG_FILE_EMPTY, this->mrl, (char *)NULL);
|
|
close (this->fh);
|
|
xine_log (this->stream->xine, XINE_LOG_MSG,
|
|
_("input_file: File empty: >%s<\n"), this->mrl);
|