[vlc-commits] Qt: fill NULL-deref in jumping forward
Jean-Baptiste Kempf
git at videolan.org
Thu Oct 13 23:15:40 CEST 2011
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 13 23:05:35 2011 +0200| [7f8fdffe5b9cf3bf04c95d356ee0d39e2153d678] | committer: Jean-Baptiste Kempf
Qt: fill NULL-deref in jumping forward
Close #5446
(cherry picked from commit 4f921a591453707451bbbf6c2a14f58d3264e2a6)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=7f8fdffe5b9cf3bf04c95d356ee0d39e2153d678
---
modules/gui/qt4/input_manager.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 7961729..a464a4e 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -862,7 +862,7 @@ void InputManager::setRate( int new_rate )
void InputManager::jumpFwd()
{
int i_interval = var_InheritInteger( p_input, "short-jump-size" );
- if( i_interval > 0 )
+ if( i_interval > 0 && hasInput() )
{
mtime_t val = (mtime_t)(i_interval) * 1000000L;
var_SetTime( p_input, "time-offset", val );
@@ -872,7 +872,7 @@ void InputManager::jumpFwd()
void InputManager::jumpBwd()
{
int i_interval = var_InheritInteger( p_input, "short-jump-size" );
- if( i_interval > 0 )
+ if( i_interval > 0 && hasInput() )
{
mtime_t val = -1 *(mtime_t)(i_interval) * 1000000L;
var_SetTime( p_input, "time-offset", val );
More information about the vlc-commits
mailing list