July 2010 Commit Log

Number of Commits:

14

Number of Active Developers:

1

rousseau 2010-07-31 22:12 #14 Rev.: 5081

--enable-muscledropdir is no more supported by pcsc-lite since a long
time. So remove the line.

0 lines of code changed in 1 file:

• c.sh (-1)

rousseau 2010-07-31 22:11 #13 Rev.: 5080

--enable-usbdropdir=/usr/lib/pcsc/drivers is now the default value.
So remove the line.

0 lines of code changed in 1 file:

• c.sh (-1)

rousseau 2010-07-31 22:09 #12 Rev.: 5079

Default value of usbdropdir is now $prefix/lib/pcsc/drivers instead of
$prefix/pcsc/drivers

The new path is the path used on Debian (with prefix-/usr). So no need
to change the default value.

3 lines of code changed in 1 file:

• configure.in (+3 -3)

rousseau 2010-07-27 09:30 #11 Rev.: 5073

Create empty directories used by drivers

Thanks to Kalev Lember for the patch
http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0065.html

4 lines of code changed in 1 file:

• src: Makefile.am (+4)

rousseau 2010-07-26 15:33 #10 Rev.: 5071

Do not affect and check a variable on the same line

30 lines of code changed in 4 files:

• src: hotplug_libhal.c (+2 -1), pcscdaemon.c (+2 -1), utils.c (+2 -1), winscard.c (+24 -12)

rousseau 2010-07-26 15:27 #9 Rev.: 5070

reformat

1 lines of code changed in 1 file:

• src: readerfactory.c (+1 -1)

rousseau 2010-07-26 15:21 #8 Rev.: 5069

Get the value of rContext before its use. A simple call to
SCardTransmit() crashed with a NULL pointer.

30 lines of code changed in 1 file:

• src: winscard.c (+30 -30)

rousseau 2010-07-08 22:35 #7 Rev.: 5066

fix crash with empty config dir

Thanks to Kalev Lember for the patch
http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0017.html

pcscd attempts to read uninitialized memory and free an invalid
pointer when its configuration directory is empty.

The patch fixes this by initializing reader_list to NULL.

==2658== Conditional jump or move depends on uninitialised value(s)
==2658== at 0x40A2EF: RFStartSerialReaders (readerfactory.c:1324)
==2658== by 0x40743F: main (pcscdaemon.c:522)
==2658== ==2658== Use of uninitialised value of size 8
==2658== at 0x40A2F5: RFStartSerialReaders (readerfactory.c:1327)
==2658== by 0x40743F: main (pcscdaemon.c:522)
==2658== ==2658== Conditional jump or move depends on uninitialised
value(s)
==2658== at 0x4C26D25: free (vg_replace_malloc.c:325)
==2658== by 0x40A404: RFStartSerialReaders (readerfactory.c:1348)
==2658== by 0x40743F: main (pcscdaemon.c:522)
==2658== ==2658== Invalid free() / delete / delete[]
==2658== at 0x4C26D72: free (vg_replace_malloc.c:325)
==2658== by 0x40A404: RFStartSerialReaders (readerfactory.c:1348)
==2658== by 0x40743F: main (pcscdaemon.c:522)
==2658== Address 0x4222148 is not stack'd, malloc'd or (recently)
free'd


--- pcsc-lite-1.6.1/src/readerfactory.c.orig2010-07-04
23:42:14.000000000 +0300
+++ pcsc-lite-1.6.1/src/readerfactory.configuration2010-07-04
23:42:23.000000000 +0300
@@ -1312,7 +1312,7 @@ void RFCleanupReaders(void)
#ifdef USE_SERIAL
int RFStartSerialReaders(const char *readerconf)
{
-readerconfSerialReader *reader_list;
+reader_listSerialReader *reader_list = NULL;
int i, rv;
/* remember the configuration filename for
* RFReCheckReaderConf() */

2 lines of code changed in 1 file:

• src: readerfactory.c (+2 -2)

rousseau 2010-07-08 22:26 #6 Rev.: 5065

more idiomatic sysconfdir usage

Thanks to Kalev Lember for the patch
http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0015.html

> URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5060
> Log: set --sysconfdir=/etc/reader.conf.d so that we parse any file in
> this directory
>
> [...]
> - --sysconfdir=/etc \
> + --sysconfdir=/etc/reader.conf.d \

It's more common to set sysconfdir to /etc and have configure script
figure out the subdirectory. The configure script should always default
to sane values when no arguments are specified. The default value for
sysconfdir is /usr/local/etc; so the configure script should just append
/reader.conf.d to that. Right now if the user doesn't override
sysconfdir, pcsc will try to go through every .conf file in
/usr/local/etc, and I don't think anything good will come out of that.

I have a patch attached which should make it more idiomatic: default to
$sysconfdir/reader.conf.d directory.

6 lines of code changed in 3 files:

• c.sh (+1 -1), configure.in (+4 -2)
• src: pcscd.h.in (+1 -1)

rousseau 2010-07-02 17:10 #5 Rev.: 5062

remove PCSCLITE_READER_CONFIG now useless

0 lines of code changed in 1 file:

• src: pcscd.h.in (-1)

rousseau 2010-07-02 17:05 #4 Rev.: 5061

main(): use PCSCLITE_CONFIG_DIR instead of PCSCLITE_READER_CONFIG to
use the directory configured using --sysconfdir=...

1 lines of code changed in 1 file:

• src: pcscdaemon.c (+1 -1)

rousseau 2010-07-02 17:02 #3 Rev.: 5060

set --sysconfdir=/etc/reader.conf.d so that we parse any file in this
directory

1 lines of code changed in 1 file:

• c.sh (+1 -1)

rousseau 2010-07-02 17:01 #2 Rev.: 5059

DBGetReaderListDir(): add a log line when parsing a directory (containing
config files)

2 lines of code changed in 1 file:

• src: configfile.l (+2)

rousseau 2010-07-02 16:39 #1 Rev.: 5058

RFCheckSharing(), RFLockSharing(), RFUnlockSharing() &
RFUnlockAllSharing(): add the READER_CONTEXT * rContext parameter to
avoid recomputing it internally (gain a few CPU cycles)

25 lines of code changed in 3 files:

• src: readerfactory.c (+7 -28), readerfactory.h (+4 -4), winscard.c (+14 -14)

June 2010 »