Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7295
Modified Files:
Tag: Feb2010
ChangeLog.Feb2010 monetdb.c
Log Message:
another size related fix, also in the realloc, this time with a wrong size :/
Index: monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb.c,v
retrieving revision 1.71.2.1
retrieving revision 1.71.2.2
diff -u -d -r1.71.2.1 -r1.71.2.2
--- monetdb.c 22 Jan 2010 07:51:31 -0000 1.71.2.1
+++ monetdb.c 7 Apr 2010 12:42:41 -0000 1.71.2.2
@@ -762,7 +762,7 @@
/* store what we found */
if (posloc == numlocs)
locations = realloc(locations,
- sizeof(char) * (numlocs
= numlocs * 2));
+ sizeof(char *) *
(numlocs = numlocs * 2));
locations[posloc++] = strdup(location);
if (strlen(location) > loclen)
loclen = strlen(location);
Index: ChangeLog.Feb2010
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/ChangeLog.Feb2010,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- ChangeLog.Feb2010 7 Apr 2010 12:24:36 -0000 1.1.2.5
+++ ChangeLog.Feb2010 7 Apr 2010 12:42:41 -0000 1.1.2.6
@@ -1,10 +1,10 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
- 07 Apr 2010; Fabian Groffen <[email protected]> control.c:
- Fix logic in buffer enlargment, causing bug #2982104. This bug
+ 07 Apr 2010; Fabian Groffen <[email protected]> control.c, monetdb.c:
+ Fix logic in buffer enlargments, causing bug #2982104. These bug
became visible when receiving more data from merovingian(1) than would
- fit in the originally allocated buffer. This could happen quite
+ fit in the originally allocated buffers. This could happen quite
easily for instance with `monetdb status` when there are many
databases.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
