dcerpc: don't exit() on malloc failure

In 2 places we would exit() if malloc failed. We should never exit in such cases. This patch silently handles it.
OISF · Feb 25, 2015 · 89017d0 · 89017d0
1 parent 56196ac
commit 89017d0
Showing 1 changed file with 14 additions and 20 deletions.
diff --git a/src/app-layer-dcerpc.c b/src/app-layer-dcerpc.c
@@ -685,17 +685,14 @@ static uint32_t DCERPCParseBINDACKCTXItem(DCERPC *dcerpc, uint8_t *input, uint32
 
                             dcerpc->dcerpcbindbindack.uuid_entry = (DCERPCUuidEntry *)
                                 SCCalloc(1, sizeof(DCERPCUuidEntry));
-                            if (dcerpc->dcerpcbindbindack.uuid_entry == NULL) {
-                                SCLogError(SC_ERR_MEM_ALLOC,
-                                           "Error allocating memory\n");
-                                exit(EXIT_FAILURE);
+                            if (dcerpc->dcerpcbindbindack.uuid_entry != NULL) {
+                                memcpy(dcerpc->dcerpcbindbindack.uuid_entry,
+                                        uuid_entry,
+                                        sizeof(DCERPCUuidEntry));
+                                TAILQ_INSERT_HEAD(&dcerpc->dcerpcbindbindack.accepted_uuid_list,
+                                        dcerpc->dcerpcbindbindack.uuid_entry,
+                                        next);
                             }
-                            memcpy(dcerpc->dcerpcbindbindack.uuid_entry,
-                                   uuid_entry,
-                                   sizeof(DCERPCUuidEntry));
-                            TAILQ_INSERT_HEAD(&dcerpc->dcerpcbindbindack.accepted_uuid_list,
-                                              dcerpc->dcerpcbindbindack.uuid_entry,
-                                              next);
                             break;
                         }
                     }
@@ -844,17 +841,14 @@ static uint32_t DCERPCParseBINDACKCTXItem(DCERPC *dcerpc, uint8_t *input, uint32
 
                         dcerpc->dcerpcbindbindack.uuid_entry = (DCERPCUuidEntry *)
                             SCCalloc(1, sizeof(DCERPCUuidEntry));
-                        if (dcerpc->dcerpcbindbindack.uuid_entry == NULL) {
-                            SCLogError(SC_ERR_MEM_ALLOC,
-                                       "Error allocating memory\n");
-                            exit(EXIT_FAILURE);
+                        if (dcerpc->dcerpcbindbindack.uuid_entry != NULL) {
+                            memcpy(dcerpc->dcerpcbindbindack.uuid_entry,
+                                    uuid_entry,
+                                    sizeof(DCERPCUuidEntry));
+                            TAILQ_INSERT_HEAD(&dcerpc->dcerpcbindbindack.accepted_uuid_list,
+                                    dcerpc->dcerpcbindbindack.uuid_entry,
+                                    next);
                         }
-                        memcpy(dcerpc->dcerpcbindbindack.uuid_entry,
-                               uuid_entry,
-                               sizeof(DCERPCUuidEntry));
-                        TAILQ_INSERT_HEAD(&dcerpc->dcerpcbindbindack.accepted_uuid_list,
-                                          dcerpc->dcerpcbindbindack.uuid_entry,
-                                          next);
                         break;
                     }
                 }