liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stream read line (#1054)

Browse Source 
* stream: fix stream_read_line return
* nfc: fix keys load

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
gornekich 2022-03-25 13:43:10 +03:00 committed by GitHub
parent 1fdc5f2950
commit 2ba3a9f09a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/nfc/helpers/nfc_mf_classic_dict.c
View File

@ -32,7 +32,7 @@ bool nfc_mf_classic_dict_get_next_key(Stream* stream, uint64_t* key) {
bool next_key_read = false; bool next_key_read = false;
while(!next_key_read) { while(!next_key_read) {
if(stream_read_line(stream, next_line)) break; if(!stream_read_line(stream, next_line)) break;
if(string_get_char(next_line, 0) == '#') continue; if(string_get_char(next_line, 0) == '#') continue;
if(string_size(next_line) != NFC_MF_CLASSIC_KEY_LEN) continue; if(string_size(next_line) != NFC_MF_CLASSIC_KEY_LEN) continue;
for(uint8_t i = 0; i < 12; i += 2) { for(uint8_t i = 0; i < 12; i += 2) {

2
lib/toolbox/stream/stream.c
View File

@ -99,7 +99,7 @@ bool stream_read_line(Stream* stream, string_t str_result) {
} }
} while(true); } while(true);
return stream_eof(stream); return string_size(str_result) != 0;
} }
bool stream_rewind(Stream* stream) { bool stream_rewind(Stream* stream) {

4
lib/toolbox/stream/stream.h
View File

@ -102,8 +102,8 @@ bool stream_delete_and_insert(
* Read line from a stream (supports LF and CRLF line endings) * Read line from a stream (supports LF and CRLF line endings)
* @param stream * @param stream
* @param str_result * @param str_result
* @return true if line was read * @return true if line lenght is not zero
* @return false if EOF * @return false otherwise
*/ */
bool stream_read_line(Stream* stream, string_t str_result); bool stream_read_line(Stream* stream, string_t str_result);