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
33 lines
1.5 KiB
Plaintext
33 lines
1.5 KiB
Plaintext
$OpenBSD: patch-src_input_input_dvd_c,v 1.4 2008/01/15 00:36:46 jakemsr Exp $
|
|
--- src/input/input_dvd.c.orig Tue Jan 1 08:30:08 2008
|
|
+++ src/input/input_dvd.c Wed Jan 9 01:50:22 2008
|
|
@@ -116,8 +116,8 @@
|
|
#define DVD_PATH "d:\\"
|
|
#define RDVD_PATH "d:\\"
|
|
#else
|
|
-#define DVD_PATH "/dev/dvd"
|
|
-#define RDVD_PATH "/dev/rdvd"
|
|
+#define DVD_PATH "/dev/rcd0c"
|
|
+#define RDVD_PATH "/dev/rcd0c"
|
|
#endif
|
|
|
|
/* Some misc. defines */
|
|
@@ -606,7 +606,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
|
|
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
|
|
_("input_dvd: Error getting next block from DVD (%s)\n"), dvdnav_err_to_string(this->dvdnav));
|
|
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
|
- dvdnav_err_to_string(this->dvdnav), NULL);
|
|
+ dvdnav_err_to_string(this->dvdnav), (char *)NULL);
|
|
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
|
|
buf->free_buffer(buf);
|
|
return NULL;
|
|
@@ -1497,7 +1497,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
|
|
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
|
|
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
|
/* FIXME: see FIXME in dvd_parse_try_open() */
|
|
- (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, NULL);
|
|
+ (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, (char *)NULL);
|
|
free (locator_orig);
|
|
return 0;
|
|
}
|