apply Bill Thomson patch

FreeTDS · Feb 27, 2003 · 3649cc1 · 3649cc1
1 parent 9ff4d81
commit 3649cc1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 27 20:50:08 CET 2003  Frediano Ziglio <freddy77@angelfire.com>
+	* doc/userguide.sgml: small change
+	* src/tds/mem.c: fix wrong memory clean causing core
+
 Tue Feb 25 22:07:08 EST 2003	JK Lowden <jklowden@schemamania.org>
 	* src/server/login.c src/pool/pool.h
 	- include sys/types.h for FreeBSD per today's list discussion

diff --git a/doc/userguide.sgml b/doc/userguide.sgml
@@ -2,8 +2,8 @@
 ]>
 <book>
 	<bookinfo>
-		<date>$Date: 2003-02-26 04:18:08 $</date>
-		<releaseinfo>$Revision: 1.51.2.4 $</releaseinfo>
+		<date>$Date: 2003-02-27 11:16:35 $</date>
+		<releaseinfo>$Revision: 1.51.2.5 $</releaseinfo>
 		<title><productname>FreeTDS</productname> User Guide</title>
 		<subtitle>A Guide to Installing, Configuring and Running <productname>FreeTDS</productname></subtitle>
 		<author>
@@ -47,9 +47,9 @@ This guide is here for you, and we hope that you will be here for it, that other
 The version you're reading is:
 			</para> 
   			<simplelist type='vert'>
-<member>$Revision: 1.51.2.4 $</>
-<member>$Date: 2003-02-26 04:18:08 $</>
-<member>CVS control number $Id: userguide.sgml,v 1.51.2.4 2003-02-26 04:18:08 jklowden Exp $.</>
+<member>$Revision: 1.51.2.5 $</>
+<member>$Date: 2003-02-27 11:16:35 $</>
+<member>CVS control number $Id: userguide.sgml,v 1.51.2.5 2003-02-27 11:16:35 freddy77 Exp $.</>
   			</simplelist>
 			</footnote>
 can be found on the <productname>FreeTDS</productname> 
@@ -2032,7 +2032,7 @@ To support these methods, some options were added.
 </para>
 
 <example>
-<title>Sample freetds.conf'less <filename>odbc.ini</filename> file (adapted from previous example)</title>
+<title>Sample freetds.conf-less <filename>odbc.ini</filename> file (adapted from previous example)</title>
 <programlisting>
 ;
 ;  odbc.ini

diff --git a/src/tds/mem.c b/src/tds/mem.c
@@ -40,7 +40,7 @@
 #include <dmalloc.h>
 #endif
 
-static char  software_version[]   = "$Id: mem.c,v 1.58 2002-12-28 19:50:58 freddy77 Exp $";
+static char  software_version[]   = "$Id: mem.c,v 1.58.2.1 2003-02-27 11:17:11 freddy77 Exp $";
 static void *no_unused_var_warn[] = {software_version,
                                      no_unused_var_warn};
 
@@ -272,7 +272,7 @@ int null_sz;
 	memset(info,'\0',sizeof(TDSCOMPUTEINFO));
 
 	TEST_MALLOCN(info->columns, TDSCOLINFO*, num_cols);
-	memset(info,'\0',sizeof(TDSCOLINFO*) * num_cols);
+	memset(info->columns,'\0',sizeof(TDSCOLINFO*) * num_cols);
 
 	tdsdump_log(TDS_DBG_INFO1, "%L alloc_compute_result. point 1\n");
 	info->num_cols = num_cols;