Merge lp:~kevin-lacqui/ubuntu/oneiric/eggdrop/fix-for-885329 into lp:ubuntu/oneiric/eggdrop

[Kevin Lacquement]

Fix of bug 885329 based on http://forum.egghelp.org/viewtopic.php?p=97173#97173

[Daniel Holbach (dholbach)]

Thanks a lot for identifying the problem and working on the fix!

A few things probably worth noting:
 - As per our SRU policy bugs in stable releases need to be fixed in the current development (precise) release first.
 - The eggdrop package uses the CDBS build- and patch-system, maybe it would make sense to borrow the relevant portion from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635274 instead (and use the changelog entry, so whoever works on a merge next knows where the change came from.)
 - A minor nitpick: generally we try to wrap the changelog entries at 80 chars.

Apart from that: great work on identifying the problem and figuring out the fix!

review: Needs Fixing

Unmerged revisions

12. By Kevin Lacquement on 2011-11-06

src/tclhash.c: Updated call to Tcl_ScanElement as per http://forum.egghelp.org/viewtopics.php?p=97173#97173 (LP: #885329)

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-22 16:28:55 +0000
+++ debian/changelog	2011-11-06 05:20:30 +0000
@@ -1,3 +1,9 @@
+eggdrop (1.6.19-1.2ubuntu3) oneiric; urgency=low
+
+  * src/tclhash.c: Updated call to Tcl_ScanElement as per http://forum.egghelp.org/viewtopics.php?p=97173#97173 (LP: #885329)
+
+ -- Kevin Lacquement <[e-mail]>  Sat, 05 Nov 2011 22:12:47 -0700
+
 eggdrop (1.6.19-1.2ubuntu2) oneiric; urgency=low
 
   * No change rebuild for libssl1.0.0 transition.

=== modified file 'src/tclhash.c'
--- src/tclhash.c	2008-08-18 00:26:01 +0000
+++ src/tclhash.c	2011-11-06 05:20:30 +0000
@@ -1202,7 +1202,7 @@
   for (i = 0; cc[i].name; i++) {
     egg_snprintf(p, sizeof p, "*%s:%s", tl->name,
                  cc[i].funcname ? cc[i].funcname : cc[i].name);
-    l = nmalloc(Tcl_ScanElement(p, &k));
+    l = nmalloc(Tcl_ScanElement(p, &k) + 1);
     Tcl_ConvertElement(p, l, k | TCL_DONT_USE_BRACES);
     table[0].cdata = (void *) cc[i].func;
     add_cd_tcl_cmds(table);
@@ -1220,7 +1220,7 @@
   for (i = 0; cc[i].name; i++) {
     egg_snprintf(p, sizeof p, "*%s:%s", table->name,
                  cc[i].funcname ? cc[i].funcname : cc[i].name);
-    l = nmalloc(Tcl_ScanElement(p, &k));
+    l = nmalloc(Tcl_ScanElement(p, &k) + 1);
     Tcl_ConvertElement(p, l, k | TCL_DONT_USE_BRACES);
     Tcl_DeleteCommand(interp, p);
     unbind_bind_entry(table, cc[i].flags, cc[i].name, l);