diff options
author | Martijn Coenen <maco@google.com> | 2015-11-05 11:10:12 +0100 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2015-11-05 17:35:07 -0800 |
commit | 63183d2980cb2ab439daf75cad5e2f952caca045 (patch) | |
tree | b52c6157165acafb085b215601e3ec57452a6ac9 | |
parent | e3b367fc88df5f7468699e3779b23779b299ad54 (diff) | |
download | libnfc-nci-63183d2980cb2ab439daf75cad5e2f952caca045.tar.gz |
Don't free memory that shouldn't be freed.android-6.0.1_r9android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr1-release
In case of NFC_ERROR_CEVT, p_data is just
a pointer to an uint8_t, and doesn't contain
data that needs to be freed. Note that there's
a fall-through from NFC_DATA_CEVT above which
warrants further investigation, but for
now this is the safe fix.
Bug: 25489121
Change-Id: Ibab5b42ca9defca04b2310c8d9a441c89f0f722d
-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: |