[Pcsclite-cvs-commit] r6325 - /trunk/PCSC/src/tokenparser.l

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Jun  6 11:54:48 2012
New Revision: 6325

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6325
Log:
Add [ and ] in the list of accepted characters for a reader name

Readers with these characters caused a crash in libccid without any
error message.
This is because the reader entry was skiped and a reader name was then
missing in the list. NULL is not a valid reader name :-)

Thanks to Philippe Teuwen for the bug report.

Modified:
    trunk/PCSC/src/tokenparser.l

Modified: trunk/PCSC/src/tokenparser.l
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/tokenparser.l?rev=6325&op=diff
==============================================================================
--- trunk/PCSC/src/tokenparser.l (original)
+++ trunk/PCSC/src/tokenparser.l Wed Jun  6 11:54:48 2012
@@ -50,7 +50,7 @@
 "\n"                                            {}
 \<key\>([A-Z]|[a-z]|[0-9]|[ \t])+\<\/key\>      { eval_key(yytext, ListKeys); }
 [ \t]                                           {}
-\<string\>([A-Z]|[a-z]|[0-9]|[ \t]|[!@#$%^&*()\-+/_\:?.,=~'";])+\<\/string\> { eval_value(yytext, ListValues); }
+\<string\>([A-Z]|[a-z]|[0-9]|[ \t]|[!@#$%^&*()\-+/_\:?.,=~'";\[\]])+\<\/string\> { eval_value(yytext, ListValues); }
 .                                               { tperrorCheck(yytext); }
 %%