X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=serial.c;h=809ea7ce108a41e0d0e942ce58980291870ea6b8;hp=8debe3b8eed128c4c147c0810c7c6de20af68542;hb=3192bff3cc2b10a7b65d185ec1bc8bf31fd4f635;hpb=0e1a2e8a78cb806312813c7c944660cdb63233b7

diff --git a/serial.c b/serial.c
index 8debe3b..809ea7c 100644
--- a/serial.c
+++ b/serial.c
@@ -4,14 +4,13 @@
 #include <string.h>
 #include "serial.h"
 
-int serial_init(serializer_t *srl, void *buffer, int size)
+void serial_init(serializer_t *srl, void *buffer, int size)
 {
 	srl->buffer = srl->cursor = buffer;
 	srl->bufsize = size;
-	return 0;
 }
 
-int serial_switch(serializer_t *srl, void *buffer, int size)
+void serial_switch(serializer_t *srl, void *buffer, int size)
 {
 	int used = srl->cursor - srl->buffer;
 
@@ -19,15 +18,15 @@ int serial_switch(serializer_t *srl, void *buffer, int size)
 	srl->buffer = buffer;
 	srl->bufsize = size;
 	srl->cursor = buffer + used;
-	return 0;
 }
 
-int serial_put(serializer_t *srl, void *item, int size)
+int serial_put(serializer_t *srl, const void *item, int size)
 {
 	int left = srl->bufsize - (srl->cursor - srl->buffer);
+
 	if (left < size + sizeof(short)) return left - sizeof(short);
 	*((short *)srl->cursor) = size;
-	srl->cursor += 2;
+	srl->cursor += sizeof(short);
 	if (size) memcpy(srl->cursor, item, size);
 	srl->cursor += size;
 	return size;
@@ -35,10 +34,13 @@ int serial_put(serializer_t *srl, void *item, int size)
 
 int serial_get(serializer_t *srl, void *item, int bufsize)
 {
+	int left = srl->bufsize - (srl->cursor - srl->buffer);
 	short isize = *((short *)srl->cursor);
-	if (isize > bufsize || isize == 0) return isize;
+
+	if (isize > bufsize) return isize;
+	if (isize + sizeof(short) > left) return -1;
 	srl->cursor += sizeof(short);
-	memcpy(item, srl->cursor, isize);
+	if (isize) memcpy(item, srl->cursor, isize);
 	srl->cursor += isize;
 	return isize;
 }