[3.0] Fix Svace warning issue

- Initialized local variable at tizen-video-player.cpp
- prevention of Null pointer dereference at seat.cpp

Change-Id: Id68f057e0b8bc9b78da435d7809374f2c21a2726

diff --git a/adaptors/wayland/input/seat.cpp b/adaptors/wayland/input/seat.cpp
index added93..a8cab4f 100644 (file)
--- a/adaptors/wayland/input/seat.cpp
+++ b/adaptors/wayland/input/seat.cpp
@@ -219,7 +219,7 @@ void Seat::SetPointerPosition( Dali::Vector2 position)
 void Seat::KeyboardKeymap( unsigned int format, int fd, unsigned int size )
 {
 
-  if(!mXkbData.mContext )
+  if( !mXkbData.mContext )
   {
     mXkbData.mContext = xkb_context_new( XKB_CONTEXT_NO_FLAGS );
   }
@@ -243,6 +243,12 @@ void Seat::KeyboardKeymap( unsigned int format, int fd, unsigned int size )
     return;
   }
 
+  if( !mXkbData.mContext )
+  {
+    DALI_LOG_ERROR("xkb_context_new failed");
+    close(fd);
+    return;
+  }
   mXkbData.mKeymap = xkb_map_new_from_string(mXkbData.mContext, map, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
 
   munmap(map, size);

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 1098ed8..890a3c6 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -71,7 +71,7 @@ BuildRequires:  pkgconfig(glesv2)
 %if "%{profile}" == "common"
 %define dali_profile COMMON
 %define dali_feedback_plugin 0
-%define dali_videoplayer_plugin 0
+%define dali_videoplayer_plugin 1
 %define tizen_2_2_compatibility 0
 %define shaderbincache_flag DISABLE
 BuildRequires:  pkgconfig(glesv2)

diff --git a/plugins/video-player/tizen-video-player.cpp b/plugins/video-player/tizen-video-player.cpp
index 812a274..5429867 100644 (file)
--- a/plugins/video-player/tizen-video-player.cpp
+++ b/plugins/video-player/tizen-video-player.cpp
@@ -491,7 +491,7 @@ Dali::VideoPlayerPlugin::DisplayRotation TizenVideoPlayer::GetDisplayRotation()
   }
 
   int error;
-  player_display_rotation_e rotation;
+  player_display_rotation_e rotation = PLAYER_DISPLAY_ROTATION_NONE;
   if( mPlayerState != PLAYER_STATE_NONE )
   {
     error = player_get_display_rotation( mPlayer, &rotation );