diff options
| author | Martijn Coenen <maco@google.com> | 2013-09-13 16:09:43 +0200 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-09-13 16:15:29 +0200 |
| commit | 9e987ccb716624d658f98abc7db2097e11e3d8ed (patch) | |
| tree | cae88aa478e403ef76a8c4aebc5ab9c093e74941 | |
| parent | 42f5b41d22bbbad1b16b9cd3aba0512a399f32a6 (diff) | |
| download | libnfc-nxp-9e987ccb716624d658f98abc7db2097e11e3d8ed.tar.gz | |
Fix crash in reader mode.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-dev
The connect callback wasn't cleared in error cases,
which could cause spurious callbacks including data
that used to be allocated on the stack, and has been
freed by now.
Also, always add the -3a tech for any IsoDep target,
even if the remote device has the P2P bit set.
Bug: 10360259
Change-Id: I73141c4a1106f66ff89c6b1c53c4977e9cb78fa1
| -rw-r--r-- | src/phHal4Nfc_ADD.c | 11 | ||||
| -rw-r--r-- | src/phHal4Nfc_Reader.c | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/phHal4Nfc_ADD.c b/src/phHal4Nfc_ADD.c index 727b7c4..d2040ea 100644 --- a/src/phHal4Nfc_ADD.c +++ b/src/phHal4Nfc_ADD.c @@ -493,13 +493,10 @@ void phHal4Nfc_TargetDiscoveryComplete( Count++; } } - if ( !(Sak & NFCIP_BITMASK) ) - { - // Always add a separate 3A target on a separate - // handle, so the upper layers can connect to it. - aRemoteDevTypes[Count] = phHal_eISO14443_3A_PICC; - Count++; - } + // Always add a separate 3A target on a separate + // handle, so the upper layers can connect to it. + aRemoteDevTypes[Count] = phHal_eISO14443_3A_PICC; + Count++; } /*Check for P2P target passive*/ if((Sak & NFCIP_BITMASK) && diff --git a/src/phHal4Nfc_Reader.c b/src/phHal4Nfc_Reader.c index f27bb09..526d0fc 100644 --- a/src/phHal4Nfc_Reader.c +++ b/src/phHal4Nfc_Reader.c @@ -237,6 +237,11 @@ NFCSTATUS phHal4Nfc_Connect( } } + if(NFCSTATUS_PENDING != RetStatus) + { + Hal4Ctxt->sUpperLayerInfo.psUpperLayerCtxt = NULL; + Hal4Ctxt->sTgtConnectInfo.pUpperConnectCb = NULL; + } return RetStatus; } |