Fixed PLM issue(P130509-0621)

Added codes to check null pointer

Change-Id: Icc4346e4337076220734d0f01017aada58837b97
Signed-off-by: Jaehwan Lee <jh8379.lee@samsung.com>

diff --git a/src/wifi/FNetWifi_WifiDirectSystemAdapter.cpp b/src/wifi/FNetWifi_WifiDirectSystemAdapter.cpp
index a4bb4f9..1ba1390 100644 (file)
--- a/src/wifi/FNetWifi_WifiDirectSystemAdapter.cpp
+++ b/src/wifi/FNetWifi_WifiDirectSystemAdapter.cpp
@@ -2115,7 +2115,8 @@ _WifiDirectSystemAdapter::GetConnectedPeerDeviceInfoN(WifiDirectGroupMemberType
        if (peerMemberType == WIFI_DIRECT_GROUP_MEMBER_TYPE_OWNER)
        {
                err = wifi_direct_foreach_connected_peers(OnWifiDirectConnectedOwner, pDeviceInfoList.get());
-               SysTryReturn(NID_NET_WIFI, err == WIFI_DIRECT_ERROR_NONE || err == WIFI_DIRECT_ERROR_OPERATION_FAILED, null, E_SYSTEM, "[E_SYSTEM] Failed result from wifi_direct_foreach_connected_peers() is 0x%x.", err);
+               SysTryReturn(NID_NET_WIFI, err == WIFI_DIRECT_ERROR_NONE || err == WIFI_DIRECT_ERROR_OPERATION_FAILED, null, E_SYSTEM,
+                               "[E_SYSTEM] Failed result from wifi_direct_foreach_connected_peers() is 0x%x.", err);
 
                if (pDeviceInfoList->GetCount() != 0)
                {
@@ -2126,7 +2127,8 @@ _WifiDirectSystemAdapter::GetConnectedPeerDeviceInfoN(WifiDirectGroupMemberType
        else
        {
                err = wifi_direct_foreach_connected_peers(OnWifiDirectEachConnectedClient, pDeviceInfoList.get());
-               SysTryReturn(NID_NET_WIFI, err == WIFI_DIRECT_ERROR_NONE || err == WIFI_DIRECT_ERROR_OPERATION_FAILED, null, E_SYSTEM, "[E_SYSTEM] Failed result from wifi_direct_foreach_connected_peers() is 0x%x.", err);
+               SysTryReturn(NID_NET_WIFI, err == WIFI_DIRECT_ERROR_NONE || err == WIFI_DIRECT_ERROR_OPERATION_FAILED, null, E_SYSTEM,
+                               "[E_SYSTEM] Failed result from wifi_direct_foreach_connected_peers() is 0x%x.", err);
 
                for (int i = 0; i < pDeviceInfoList->GetCount(); i++)
                {
@@ -2140,6 +2142,8 @@ _WifiDirectSystemAdapter::GetConnectedPeerDeviceInfoN(WifiDirectGroupMemberType
                }
        }
 
+       SysTryReturn(NID_NET_WIFI, pDeviceInfo != null, null, E_SYSTEM, "[E_SYSTEM] Failed to get a peer information.");
+
        return new (std::nothrow) WifiDirectDeviceInfo(*pDeviceInfo);
 }
 
@@ -2344,7 +2348,12 @@ _WifiDirectSystemAdapter::OnWifiDirectConnected(const Tizen::Base::String& peerM
                {
                        AddPeerInfo(pDeviceInfo.get());
                        pEventArg = new (std::nothrow) _WifiDirectEventArg(WIFI_DIRECT_DEVICE_EVENT_CONNECTED, DEFAULT_DEVICE_ID, *pDeviceInfo, r);
-
+                       SysTryReturnVoidResult(NID_NET_WIFI, pEventArg != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+               }
+               else
+               {
+                       SysLog(NID_NET_WIFI, "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+                       pEventArg = new (std::nothrow) _WifiDirectEventArg(WIFI_DIRECT_DEVICE_EVENT_CONNECTED, DEFAULT_DEVICE_ID, WifiDirectDeviceInfo(), E_SYSTEM);
                        SysTryReturnVoidResult(NID_NET_WIFI, pEventArg != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
                }
        }