summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-06-24 22:11:25 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-06-24 22:11:25 +0000
commite0d2ad5a49914f75c734af2abac096a9e0b167c7 (patch)
tree7dea8ecb569d6703c849aa23d7fbbd7628196fc8 /sys-process/htop/files
parentVersion bump (diff)
downloadgentoo-2-e0d2ad5a49914f75c734af2abac096a9e0b167c7.tar.gz
gentoo-2-e0d2ad5a49914f75c734af2abac096a9e0b167c7.tar.bz2
gentoo-2-e0d2ad5a49914f75c734af2abac096a9e0b167c7.zip
Another debug fix, bug 372911.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'sys-process/htop/files')
-rw-r--r--sys-process/htop/files/htop-0.9-debug.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/sys-process/htop/files/htop-0.9-debug.patch b/sys-process/htop/files/htop-0.9-debug.patch
new file mode 100644
index 000000000000..a1aa1b9ea3ec
--- /dev/null
+++ b/sys-process/htop/files/htop-0.9-debug.patch
@@ -0,0 +1,31 @@
+--- trunk/DebugMemory.c 2006/11/08 20:40:10 66
++++ trunk/DebugMemory.c 2011/03/22 20:37:08 216
+@@ -90,7 +90,7 @@
+ return data;
+ }
+
+-void* DebugMemory_strdup(char* str, char* file, int line) {
++void* DebugMemory_strdup(const char* str, char* file, int line) {
+ assert(str);
+ char* data = strdup(str);
+ DebugMemory_registerAllocation(data, file, line);
+@@ -102,7 +102,7 @@
+ }
+
+ void DebugMemory_free(void* data, char* file, int line) {
+- assert(data);
++ if (!data) return;
+ DebugMemory_registerDeallocation(data, file, line);
+ if (singleton->file) {
+ if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
+--- trunk/Process.c 2010/11/22 12:40:20 206
++++ trunk/Process.c 2011/03/22 20:37:08 216
+@@ -471,7 +471,7 @@
+ RichString_setAttr(out, CRT_colors[PROCESS_SHADOW]);
+ if (this->tag == true)
+ RichString_setAttr(out, CRT_colors[PROCESS_TAG]);
+- assert(out->len > 0);
++ assert(out->chlen > 0);
+ }
+
+ void Process_delete(Object* cast) {