[NFC] Prevent crash when nfc_ndef_record_get_uri fails to set out parameter 67/79867/1
authorJakub Skowron <j.skowron@samsung.com>
Wed, 13 Jul 2016 08:58:17 +0000 (10:58 +0200)
committerJakub Skowron <j.skowron@samsung.com>
Wed, 13 Jul 2016 08:58:17 +0000 (10:58 +0200)
Currently nfc_ndef_record_get_uri sometimes returns NFC_ERROR_NONE
while not setting uri parameter correctly.

[Verification]
  Code compiles without errors.

Change-Id: I9e420f8317c561849bd241f36d767c9c17df85ad
Signed-off-by: Jakub Skowron <j.skowron@samsung.com>
src/nfc/nfc_message_utils.cc

index 5494b22..c5fc48a 100644 (file)
@@ -767,7 +767,7 @@ static PlatformResult getURIFromHandle(nfc_ndef_record_h handle,
   LoggerD("Entered");
   char* uri = NULL;
   int result = nfc_ndef_record_get_uri(handle, &uri);
-  if (NFC_ERROR_NONE != result) {
+  if (NFC_ERROR_NONE != result || !uri) {
     LoggerE("Can't get record's uri: %d, %s", result,
             NFCUtil::getNFCErrorMessage(result).c_str());
     NFCMessageUtils::RemoveMessageHandle(message_handle);