From c5cc15c15b1a45d6d00360e55f5d2af652f6cef6 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Tue, 25 Aug 2015 16:12:14 +0900 Subject: [PATCH] Fix prevent issues - Fix xiEvent.mask, xiEvent.mask_len - oss = ""+keepUpdateStatus+"":"" to oss = ""; oss+= (keepUpdatingStatus?"":""); Change-Id: Iba01850958c432e73da5b49fbaf3fc9dddcc4ea8 --- adaptors/base/update-thread.cpp | 3 ++- adaptors/x11/ecore-x-event-handler.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/adaptors/base/update-thread.cpp b/adaptors/base/update-thread.cpp index 451d301..ce80037 100644 --- a/adaptors/base/update-thread.cpp +++ b/adaptors/base/update-thread.cpp @@ -190,7 +190,8 @@ void UpdateThread::UpdateStatusLogging( unsigned int keepUpdatingStatus ) if ( !(++mStatusLogCount % mStatusLogInterval) ) { - oss = "UpdateStatusLogging keepUpdating: " + keepUpdatingStatus ? "true":"false"; + oss = "UpdateStatusLogging keepUpdating: "; + oss += (keepUpdatingStatus ? "true":"false"); if ( keepUpdatingStatus ) { diff --git a/adaptors/x11/ecore-x-event-handler.cpp b/adaptors/x11/ecore-x-event-handler.cpp index 39296ac..739ed0b 100644 --- a/adaptors/x11/ecore-x-event-handler.cpp +++ b/adaptors/x11/ecore-x-event-handler.cpp @@ -372,10 +372,14 @@ struct EventHandler::Impl mXiDeviceId = xiEventMask.deviceid; // SelectXi2Event - xiEventMask.mask = (unsigned char*)(calloc( 1, XIMaskLen( XI_LASTEVENT ) ) ); + Dali::Vector< unsigned char > mask; + std::size_t xiMaskLen = XIMaskLen( XI_LASTEVENT ); + mask.Reserve( xiMaskLen ); + xiEventMask.mask = mask.Begin(); + XISetMask( xiEventMask.mask, XI_RawMotion ); - xiEventMask.mask_len = sizeof( xiEventMask.mask ); + xiEventMask.mask_len = xiMaskLen * sizeof( unsigned char ); int ret = XISelectEvents( display, rootWindow, &xiEventMask, 1 ); if( ret == 0 ) @@ -387,8 +391,6 @@ struct EventHandler::Impl { DALI_LOG_INFO( gImfLogging, Debug::General, "Failed to Select Events\n" ); } - - free( xiEventMask.mask ); } if( deviceInfo != NULL ) -- 2.7.4