diff options
| author | Martijn Coenen <maco@google.com> | 2015-11-05 13:31:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 13:31:25 +0000 |
| commit | 43a0cc88d175e7aee4d86222ceb05a355ead163e (patch) | |
| tree | d74ba8d6260c909058f9a5c85a628c63ce651292 | |
| parent | da550d4b244b278bc10406bb5f0e7f17441a4404 (diff) | |
| parent | 5656a6b488ae84bbd80f13f8ff1007134c328f50 (diff) | |
| download | libnfc-nci-43a0cc88d175e7aee4d86222ceb05a355ead163e.tar.gz | |
Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696e am: 30af63ccfe
am: 5656a6b488
* commit '5656a6b488ae84bbd80f13f8ff1007134c328f50':
Don't free memory that shouldn't be freed.
| -rw-r--r-- | src/nfc/tags/rw_t1t.c | 6 | ||||
| -rw-r--r-- | src/nfc/tags/rw_t2t.c | 7 |
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: |