bk commit into 3.23 tree

Below is the list of changes that have just been committed into a local
3.23 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1373 03/04/26 17:57:19 monty@xxxxxxxxxxxxxxx +2 -0
  Fix possible memory overrun when reading broken character set files

  sql/mysqld.cc
    1.274 03/04/26 17:57:17 monty@xxxxxxxxxxxxxxx +1 -1
    Safety fix.

  mysys/charset.c
    1.26 03/04/26 17:57:16 monty@xxxxxxxxxxxxxxx +1 -1
    Fix possible memory overrun when reading broken character set files

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: monty
# Host: mashka.mysql.fi
# Root: /home/my/mysql-3.23

--- 1.25/mysys/charset.c        Mon May 13 05:00:23 2002
+++ 1.26/mysys/charset.c        Sat Apr 26 17:57:16 2003
@@ -85,7 +85,7 @@
     endptr = fb->buf;
   }
 
-  while (!isspace(*endptr))
+  while (*endptr && !isspace(*endptr))
     *buf++= *endptr++;
   *buf=0;
   fb->p = endptr;

--- 1.273/sql/mysqld.cc Mon Apr  7 21:36:44 2003
+++ 1.274/sql/mysqld.cc Sat Apr 26 17:57:17 2003
@@ -785,7 +785,7 @@
   if (!opt_bootstrap)
     (void) my_delete(pidfile_name,MYF(0));     // This may not always exist
 #endif
-  if (print_message)
+  if (print_message && errmesg)
     sql_print_error(ER(ER_SHUTDOWN_COMPLETE),my_progname);
   x_free((gptr) my_errmsg[ERRMAPP]);   /* Free messages */
   my_thread_end();

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx