arti/i237
1
0
Fork 0
Code Releases Activity

Compare commits

base: arti:lab06
Branches Tags
arti:master arti:lab06-card-uid-fixes arti:lab04-alt arti:lab03.2-alternative
arti:lab06 arti:lab05 arti:lab04 arti:lab04-alt arti:lab03.2 arti:oldlab032 arti:lab03.1 arti:lab02 arti:lab01
..
compare: arti:lab06-card-uid-fixes
Branches Tags
arti:master arti:lab06-card-uid-fixes arti:lab04-alt arti:lab03.2-alternative
arti:lab06 arti:lab05 arti:lab04 arti:lab04-alt arti:lab03.2 arti:oldlab032 arti:lab03.1 arti:lab02 arti:lab01

2 Commits
lab06 ... lab06-card

Author SHA1 Message Date
Arti Zirk
bad2fd2876 Maybe fix handling of 7byte and 10byte uid cards 2016-12-21 01:56:22 +02:00
Arti Zirk
0f5a58fa50 Fix a memory leak when malloc fails on adding a new card. 2016-12-21 01:42:08 +02:00
1 changed files with 4 additions and 2 deletions
Expand all files Collapse all files

6
src/rfid.c
View File

@ -42,8 +42,8 @@ card_t* rfid_find_card(const card_t *card)
card_t *current;
current = head;
while (current != NULL) {
if ((current->uid_size != card->uid_size) ||
!memcmp(current->uid, card->uid, current->uid_size) ||
if (((current->uid_size == card->uid_size) &&
!memcmp(current->uid, card->uid, current->uid_size)) ||
((card->user != NULL) && !strcmp(current->user, card->user))) {
return current;
@ -72,6 +72,8 @@ void rfid_add_card(const card_t *card)
new_card_user = malloc(strlen(card->user) + 1);
if (!new_card || !new_card_user) {
printf_P(PSTR(OUT_OF_MEMORY_MSG "\n"));
free(new_card_user);
free(new_card);
return;
}