Changeset 2911 for releases

Timestamp:

04/26/06 10:07:18 (3 years ago)

Author:

aj

Message:

fix a memory leak.
don't access buffer beyond length.

Files:

• releases/opensc-0.11.0/src/libopensc/apdu.c (modified) (2 diffs)

releases/opensc-0.11.0/src/libopensc/apdu.c

@@ -203 +203 @@
                 return SC_ERROR_MEMORY_FAILURE;
         /* encode the APDU in the buffer */
-        if (sc_apdu2bytes(ctx, apdu, proto, nbuf, nlen) != SC_SUCCESS)
+        if (sc_apdu2bytes(ctx, apdu, proto, nbuf, nlen) != SC_SUCCESS) {
+                free(nbuf);
                 return SC_ERROR_INTERNAL;
+        }
         *buf = nbuf;
         *len = nlen;
@@ -225 +227 @@
         len -= 2;
         /* set output length and copy the returned data if necessary */
-        if (len <= apdu->resplen)
+        if (apdu->resplen >= len) {
                 apdu->resplen = len;
-
-        if (apdu->resplen != 0)
                 memcpy(apdu->resp, buf, apdu->resplen);
+        }
 
         return SC_SUCCESS;