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
41 lines
1.7 KiB
Plaintext
41 lines
1.7 KiB
Plaintext
$OpenBSD: patch-src_xine-engine_audio_out_c,v 1.6 2008/01/15 00:36:46 jakemsr Exp $
|
|
--- src/xine-engine/audio_out.c.orig Tue Jan 1 08:30:09 2008
|
|
+++ src/xine-engine/audio_out.c Wed Jan 9 01:50:22 2008
|
|
@@ -1083,7 +1083,7 @@ static void *ao_loop (void *this_gen) {
|
|
in_buf->format.rate,
|
|
in_buf->format.mode) == 0 ) {
|
|
in_buf->stream->emergency_brake = 1;
|
|
- _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (in_buf->stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
}
|
|
}
|
|
}
|
|
@@ -1114,7 +1114,7 @@ static void *ao_loop (void *this_gen) {
|
|
stream = xine_list_get_value (this->streams, ite);
|
|
if( !stream->emergency_brake ) {
|
|
stream->emergency_brake = 1;
|
|
- _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&this->streams_lock);
|
|
@@ -1498,7 +1498,7 @@ static int ao_open(xine_audio_port_t *this_gen, xine_s
|
|
|
|
if( !ret ) {
|
|
stream->emergency_brake = 1;
|
|
- _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, NULL);
|
|
+ _x_message (stream, XINE_MSG_AUDIO_OUT_UNAVAILABLE, (char *)NULL);
|
|
return 0;
|
|
}
|
|
} else {
|
|
@@ -2247,7 +2247,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_dr
|
|
this->audio_loop_running = 1;
|
|
|
|
pthread_attr_init(&pth_attrs);
|
|
+#if !defined(__OpenBSD__)
|
|
pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
|
|
+#endif
|
|
|
|
this->audio_thread_created = 1;
|
|
if ((err = pthread_create (&this->audio_thread,
|