Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory
sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10767/src/backends/monet5/merovingian
Modified Files:
control.c
Log Message:
propagated changes of Wednesday Apr 07 2010 - Thursday Apr 08 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/04/07 - mr-meltdown: src/backends/monet5/merovingian/control.c,1.8.2.1
Fix for bug #2982104, make sure we also record that we enlarged the buffer
when data no longer fits.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: control.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/control.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- control.c 2 Apr 2010 07:48:59 -0000 1.9
+++ control.c 8 Apr 2010 11:27:24 -0000 1.10
@@ -146,7 +146,8 @@
return(strdup("failed to allocate memory"));
while ((len = recv(sock, buf + bufpos, buflen - bufpos, 0)) >
0) {
if (len == buflen - bufpos) {
- bufp = realloc(buf, sizeof(char) * buflen * 2);
+ buflen *= 2;
+ bufp = realloc(buf, sizeof(char) * buflen);
if (bufp == NULL) {
free(buf);
return(strdup("failed to allocate more
memory"));
------------------------------------------------------------------------------
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
