Changeset 677

Timestamp:

05/29/05 16:30:32 (7 years ago)

Author:

aj

Message:

add/fix/unify out of memory handling.

Location:

trunk/src/ifd

Files:

• conf.c (modified) (1 diff)
• device.c (modified) (1 diff)
• driver.c (modified) (3 diffs)
• ifd-cardman.c (modified) (1 diff)
• ifd-ccid.c (modified) (2 diffs)
• ifd-cm4000.c (modified) (1 diff)
• ifd-gempc.c (modified) (1 diff)
• ifd-kaan.c (modified) (2 diffs)
• locks.c (modified) (1 diff)
• protocol.c (modified) (2 diffs)
• ria-server.c (modified) (1 diff)
• ria.c (modified) (1 diff)
• sys-bsd.c (modified) (1 diff)
• sys-linux.c (modified) (1 diff)
• sys-solaris.c (modified) (4 diffs)
• sys-sunray.c (modified) (1 diff)
• usb-descriptors.c (modified) (3 diffs)

trunk/src/ifd/conf.c

@@ -201 +201 @@
 
         node = (ifd_conf_node_t *) calloc(1, sizeof(*node));
+        if (!node) {
+                ct_error("out of memory");
+                return NULL;
+        }
         node->name = strdup(name);
 

trunk/src/ifd/device.c

@@ -46 +46 @@
 
         dev = (ifd_device_t *) calloc(1, size);
+        if (!dev) {
+                ct_error("out of memory");
+                return NULL;
+        }
         dev->name = strdup(name);
         dev->ops = ops;

trunk/src/ifd/driver.c

@@ -36 +36 @@
 
         ip = (struct ifd_driver_info *)calloc(1, sizeof(*ip));
+        if (!ip) {
+                ct_error("out of memory");
+                return NULL;
+        }
         ip->driver.name = strdup(name);
         ip->next = list;
@@ -55 +59 @@
 }
 
-void ifd_driver_add_id(const char *id, const char *name)
+int ifd_driver_add_id(const char *id, const char *name)
 {
         struct ifd_driver_info *ip;
@@ -61 +65 @@
         ifd_debug(3, "ifd_driver_add_id(%s, %s)", id, name);
         ip = find_by_name(name, 1);
+        if (!ip)
+                return -1;
+
         ip->id = (ifd_devid_t *) realloc(ip->id,
                                          (ip->nids + 1) * sizeof(ifd_devid_t));
+        if (!ip->id) {
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
+        }
         if (ifd_device_id_parse(id, &ip->id[ip->nids]) >= 0)
                 ip->nids++;

trunk/src/ifd/ifd-cardman.c

@@ -59 +59 @@
         }
         priv = (cm_priv_t *) calloc(1, sizeof(cm_priv_t));
+        if (!priv) {
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
+        }
 
         reader->driver_data = priv;

trunk/src/ifd/ifd-ccid.c

@@ -559 +559 @@
      }
 
-     if ((st = (ccid_status_t *) calloc(1, sizeof(*st))) == NULL)
+     if ((st = (ccid_status_t *) calloc(1, sizeof(*st))) == NULL) {
+          ct_error("out of memory");
           return IFD_ERROR_NO_MEMORY;
+     }
 
      st->usb_interface=intf->bInterfaceNumber;
@@ -978 +980 @@
      }
 
-     apdu=(unsigned char *) malloc(len);
-     if (!apdu)
+     apdu=(unsigned char *) calloc(1,len);
+     if (!apdu) {
+          ct_error("out of memory");
           return IFD_ERROR_NO_MEMORY;
+     }
      memcpy(apdu, buffer, len);
      st->sbuf[dad]=apdu;

trunk/src/ifd/ifd-cm4000.c

@@ -46 +46 @@
 
         priv = (cm_priv_t *) calloc(1, sizeof(cm_priv_t));
+        if (!priv) {
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
+        }
 
         reader->driver_data = priv;

trunk/src/ifd/ifd-gempc.c

@@ -72 +72 @@
 
         st = (gpc_status_t *) calloc(1, sizeof(*st));
+        if (!st) {
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
+        }
         reader->driver_data = st;
 

trunk/src/ifd/ifd-kaan.c

@@ -87 +87 @@
 
         reader->device = dev;
-        if ((st = (kaan_status_t *) calloc(1, sizeof(*st))) == NULL)
+        if ((st = (kaan_status_t *) calloc(1, sizeof(*st))) == NULL) {
+                ct_error("out of memory");
                 return IFD_ERROR_NO_MEMORY;
+        }
         st->reader_type = TYPE_KAAN;
         st->icc_proto[0] = -1;
@@ -170 +172 @@
 
         reader->device = dev;
-        if ((st = (kaan_status_t *) calloc(1, sizeof(*st))) == NULL)
+        if ((st = (kaan_status_t *) calloc(1, sizeof(*st))) == NULL) {
+                ct_error("out of memory");
                 return IFD_ERROR_NO_MEMORY;
+        }
         st->reader_type = TYPE_B1;
         st->icc_proto[0] = -1;

trunk/src/ifd/locks.c

@@ -43 +43 @@
         /* No conflict - grant lock and record this fact */
         l = (ct_lock_t *) calloc(1, sizeof(*l));
+        if (!l) {
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
+        }
         l->exclusive = (type == IFD_LOCK_EXCLUSIVE);
         l->uid = sock->client_uid;

trunk/src/ifd/protocol.c

@@ -19 +19 @@
  * Register a protocol
  */
-void ifd_protocol_register(struct ifd_protocol_ops *ops)
+int ifd_protocol_register(struct ifd_protocol_ops *ops)
 {
         struct ifd_protocol_info *info, **ptr;
 
         info = (struct ifd_protocol_info *)calloc(1, sizeof(*info));
+        if (!info) {
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
+        }
         info->ops = ops;
 
         for (ptr = &list; *ptr; ptr = &(*ptr)->next) ;
         *ptr = info;
+        return 0;
 }
 
@@ -199 +204 @@
 
         p = (ifd_protocol_t *) calloc(1, ops->size);
+        if (!p) {
+                ct_error("out of memory");
+                return p;
+        }
         p->reader = reader;
         p->ops = ops;

trunk/src/ifd/ria-server.c

@@ -260 +260 @@
 
         clnt = (ria_peer_t *) calloc(1, sizeof(ria_peer_t));
+        if (!clnt) {
+                ct_error("out of memory");
+                return NULL;
+        }
         clnt->sock = sock;
         ria_svc_link(clnt);

trunk/src/ifd/ria.c

@@ -38 +38 @@
 
         clnt = (ria_client_t *) calloc(1, sizeof(*clnt) + RIA_QUEUE_LEN);
+        if (!clnt) {
+                ct_error("out of memory");
+                return NULL;
+        }
         ct_buf_init(&clnt->data, (clnt + 1), RIA_QUEUE_LEN);
 

trunk/src/ifd/sys-bsd.c

@@ -160 +160 @@
 
         if (!(cap = (ifd_usb_capture_t *) calloc(1, sizeof(*cap) + maxpacket))) {
-                ct_debug("ifd_sysdep_usb_begin_capture: calloc failed");
-                return -1;
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
         }
         cap->type = type;

trunk/src/ifd/sys-linux.c

@@ -199 +199 @@
 
         cap = (ifd_usb_capture_t *) calloc(1, sizeof(*cap) + maxpacket);
+        if (!cap) {
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
+        }
 
         cap->type = type;

trunk/src/ifd/sys-solaris.c

@@ -85 +85 @@
                 char *devstat;
 
-                if ((devstat = malloc(strlen(name) + 2)) == NULL) {
-                        ct_error("devstat malloc failed");
-                        return -1;
-                }
-                memset(devstat, 0, strlen(name) + 2);
+                if ((devstat = calloc(1,strlen(name) + 2)) == NULL) {
+                        ct_error("out of memory");
+                        return IFD_ERROR_NO_MEMORY;
+                }
                 strcpy(devstat, name);
                 strcpy(devstat + strlen(name) - 6, "devstat");
@@ -118 +117 @@
                 char *cntrl0stat;
 
-                if ((cntrl0stat = malloc(strlen(name) + 5)) == NULL) {
-                        ct_error("cntrl0stat malloc failed");
+                if ((cntrl0stat = calloc(1, strlen(name) + 5)) == NULL) {
+                        ct_error("out of memory");
                         return -1;
                 }
-                memset(cntrl0stat, 0, strlen(name) + 5);
                 strcpy(cntrl0stat, name);
                 strcat(cntrl0stat, "stat");
@@ -306 +304 @@
         bytes_to_process = USB_REQUEST_SIZE +
             ((requesttype & USB_EP_DIR_MASK) == USB_EP_DIR_OUT ? len : 0);
-        if ((usb_control_req = malloc(bytes_to_process)) == NULL) {
-                ct_error("usb_control_req malloc failed");
-                return -1;
-        }
-        memset(usb_control_req, 0, bytes_to_process);
-        if ((recv_data = malloc(len)) == NULL) {
-                ct_error("recv_data malloc failed");
+        if ((usb_control_req = calloc(1,bytes_to_process)) == NULL) {
+                ct_error("out of memory");
+                return -1;
+        }
+        if ((recv_data = calloc(1,len)) == NULL) {
+                ct_error("out of memory");
                 free(usb_control_req);
                 return -1;
@@ -464 +461 @@
 
         if (!(cap = (ifd_usb_capture_t *) calloc(1, sizeof(*cap) + maxpacket))) {
-                ct_debug("ifd_sysdep_usb_begin_capture: cannot calloc");
+                ct_error("out of memory");
                 return -1;
         }

trunk/src/ifd/sys-sunray.c

@@ -115 +115 @@
 
         if (!(cap = (ifd_usb_capture_t *) calloc(1, sizeof(*cap) + maxpacket))) {
-                ct_debug("ifd_sysdep_usb_begin_capture: calloc failed");
-                return -1;
+                ct_error("out of memory");
+                return IFD_ERROR_NO_MEMORY;
         }
         cap->type = type;

trunk/src/ifd/usb-descriptors.c

@@ -92 +92 @@
         endpoint->extra = (unsigned char *)malloc(len);
         if (!endpoint->extra) {
-                ct_debug
-                    ("couldn't allocate memory for endpoint extra descriptors");
+                ct_error("out of memory");
                 endpoint->extralen = 0;
                 return parsed;
@@ -121 +120 @@
                         );
                 if (!interface->altsetting) {
-                        ct_debug("couldn't malloc interface->altsetting");
+                        ct_error("out of memory");
                         return -1;
                 }
@@ -176 +175 @@
                         ifp->extra = (unsigned char *)malloc(len);
                         if (!ifp->extra) {
-                                ct_debug
-                                    ("couldn't allocate memory for interface extra descriptors");
+                                ct_error("out of memory");
                                 ifp->extralen = 0;
                                 return -1;