summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2015-11-05 13:26:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-05 13:26:30 +0000
commit30af63ccfe160852e82e71f253b7c14986eb8fd5 (patch)
treefc91e5ac9f368e3fa3fc803c22f88802436278c3
parent59f2e9f65e2549c1fecb2629e821160b5ea934f6 (diff)
parentc4ea0a696e0d09c1f69d629e1aa5d49de63d7b1e (diff)
downloadlibnfc-nci-30af63ccfe160852e82e71f253b7c14986eb8fd5.tar.gz
Merge "Don\'t free memory that shouldn\'t be freed."
am: c4ea0a696e * commit 'c4ea0a696e0d09c1f69d629e1aa5d49de63d7b1e': Don't free memory that shouldn't be freed.
-rw-r--r--src/nfc/tags/rw_t1t.c6
-rw-r--r--src/nfc/tags/rw_t2t.c7
2 files changed, 0 insertions, 13 deletions
diff --git a/src/nfc/tags/rw_t1t.c b/src/nfc/tags/rw_t1t.c
index a7a8001..e7d373e 100644
--- a/src/nfc/tags/rw_t1t.c
+++ b/src/nfc/tags/rw_t1t.c
@@ -295,12 +295,6 @@ void rw_t1t_conn_cback (UINT8 conn_id, tNFC_CONN_EVT event, tNFC_CONN *p_data)
{
rw_t1t_process_error ();
}
- if((p_data != NULL) && (p_data->data.p_data != NULL))
- {
- /* Free the response buffer in case of invalid response*/
- GKI_freebuf((BT_HDR *) (p_data->data.p_data));
- p_data->data.p_data = NULL;
- }
break;
default:
diff --git a/src/nfc/tags/rw_t2t.c b/src/nfc/tags/rw_t2t.c
index e6f5b5b..de2de64 100644
--- a/src/nfc/tags/rw_t2t.c
+++ b/src/nfc/tags/rw_t2t.c
@@ -346,13 +346,6 @@ void rw_t2t_conn_cback (UINT8 conn_id, tNFC_CONN_EVT event, tNFC_CONN *p_data)
{
rw_t2t_process_error ();
}
- /* Free the response buffer in case of invalid response*/
- if((p_data != NULL) && (p_data->data.p_data != NULL))
- {
- /* Free the response buffer in case of invalid response*/
- GKI_freebuf((BT_HDR *) (p_data->data.p_data));
- p_data->data.p_data = NULL;
- }
break;
default: