Changeset 9277 for trunk/oscam-garbage.c
- Timestamp:
- 01/11/14 21:52:46 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-garbage.c
r9093 r9277 37 37 if(!garbage_collector_active || garbage_debug == 1) 38 38 { 39 //cs_sleepms(1); 40 free(data); 39 NULLFREE(data); 41 40 return; 42 41 } … … 46 45 if(!cs_malloc(&garbage, sizeof(struct cs_garbage))) 47 46 { 48 //cs_sleepms(1);49 free(data);47 cs_log("*** MEMORY FULL -> FREEING DIRECT MAY LEAD TO INSTABILITY!!!! ***"); 48 NULLFREE(data); 50 49 return; 51 50 } … … 70 69 cs_log("Original garbage addition: %s, line %d.", garbagecheck->file, garbagecheck->line); 71 70 cs_writeunlock(&garbage_lock[bucket]); 72 free(garbage);71 NULLFREE(garbage); 73 72 return; 74 73 } … … 126 125 { 127 126 next = garbage->next; 128 if(garbage->data) 129 free(garbage->data); 130 free(garbage); 127 NULLFREE(garbage->data); 128 NULLFREE(garbage); 131 129 garbage = next; 132 130 } … … 185 183 { 186 184 struct cs_garbage *next = garbage_first[i]->next; 187 free(garbage_first[i]->data);188 free(garbage_first[i]);185 NULLFREE(garbage_first[i]->data); 186 NULLFREE(garbage_first[i]); 189 187 garbage_first[i] = next; 190 188 }
Note:
See TracChangeset
for help on using the changeset viewer.