~drizzle-developers/ubuntu/karmic/drizzle/ppa

« back to all changes in this revision

Viewing changes to debian/patches/fix-static-double-free.patch

  • Committer: Monty Taylor
  • Date: 2010-11-10 22:59:29 UTC
  • mfrom: (1308.1.27 ubuntu)
  • Revision ID: mordred@inaugust.com-20101110225929-fd7pqkg4xtuidm10
* New upstream release.
* New upstream release.
* drizzledump.1 manpage shipping in tarball now.
* Removed quilt patches for things applied upstream.
* Added support for RabbitMQ plugin.
* Added support for libnotify error message plugin.
* Added build depend on libboost-iostreams-dev.
* Karmic PPA

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Fixed a double-free.
2
 
--- a/drizzled/sql_string.cc
3
 
+++ b/drizzled/sql_string.cc
4
 
@@ -117,7 +117,8 @@
5
 
   str_length=0;
6
 
   if (Alloced_length < arg_length)
7
 
   {
8
 
-    free();
9
 
+    if (Alloced_length > 0)
10
 
+      free();
11
 
     if (!(Ptr=(char*) malloc(arg_length)))
12
 
       return true;
13
 
     Alloced_length=arg_length;