mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
25221cccd2
In sql_class.cc, 'row_count', of type 'ha_rows', was used as last argument for ER_TRUNCATED_WRONG_VALUE_FOR_FIELD which is "Incorrect %-.32s value: '%-.128s' for column '%.192s' at row %ld". So 'ha_rows' was used as 'long'. On SPARC32 Solaris builds, 'long' is 4 bytes and 'ha_rows' is 'longlong' i.e. 8 bytes. So the printf-like code was reading only the first 4 bytes. Because the CPU is big-endian, 1LL is 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x01 so the first four bytes yield 0. So the warning message had "row 0" instead of "row 1" in test outfile_loaddata.test: -Warning 1366 Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 1 +Warning 1366 Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 0 All error-messaging functions which internally invoke some printf-life function are potential candidate for such mistakes. One apparently easy way to catch such mistakes is to use ATTRIBUTE_FORMAT (from my_attribute.h). But this works only when call site has both: a) the format as a string literal b) the types of arguments. So: func(ER(ER_BLAH), 10); will silently not be checked, because ER(ER_BLAH) is not known at compile time (it is known at run-time, and depends on the chosen language). And func("%s", a va_list argument); has the same problem, as the *real* type of arguments is not known at this site at compile time (it's known in some caller). Moreover, func(ER(ER_BLAH)); though possibly correct (if ER(ER_BLAH) has no '%' markers), will not compile (gcc says "error: format not a string literal and no format arguments"). Consequences: 1) ATTRIBUTE_FORMAT is here added only to functions which in practice take "string literal" formats: "my_error_reporter" and "print_admin_msg". 2) it cannot be added to the other functions: my_error(), push_warning_printf(), Table_check_intact::report_error(), general_log_print(). To do a one-time check of functions listed in (2), the following "static code analysis" has been done: 1) replace my_error(ER_xxx, arguments for substitution in format) with the equivalent my_printf_error(ER_xxx,ER(ER_xxx), arguments for substitution in format), so that we have ER(ER_xxx) and the arguments *in the same call site* 2) add ATTRIBUTE_FORMAT to push_warning_printf(), Table_check_intact::report_error(), general_log_print() 3) replace ER(xxx) with the hard-coded English text found in errmsg.txt (like: ER(ER_UNKNOWN_ERROR) is replaced with "Unknown error"), so that a call site has the format as string literal 4) this way, ATTRIBUTE_FORMAT can effectively do its job 5) compile, fix errors detected by ATTRIBUTE_FORMAT 6) revert steps 1-2-3. The present patch has no compiler error when submitted again to the static code analysis above. It cannot catch all problems though: see Field::set_warning(), in which a call to push_warning_printf() has a variable error (thus, not replacable by a string literal); I checked set_warning() calls by hand though. See also WL 5883 for one proposal to avoid such bugs from appearing again in the future. The issues fixed in the patch are: a) mismatch in types (like 'int' passed to '%ld') b) more arguments passed than specified in the format. This patch resolves mismatches by changing the type/number of arguments, not by changing error messages of sql/share/errmsg.txt. The latter would be wrong, per the following old rule: errmsg.txt must be as stable as possible; no insertions or deletions of messages, no changes of type or number of printf-like format specifiers, are allowed, as long as the change impacts a message already released in a GA version. If this rule is not followed: - Connectors, which use error message numbers, will be confused (by insertions/deletions of messages) - using errmsg.sys of MySQL 5.1.n with mysqld of MySQL 5.1.(n+1) could produce wrong messages or crash; such usage can easily happen if installing 5.1.(n+1) while /etc/my.cnf still has --language=/path/to/5.1.n/xxx; or if copying mysqld from 5.1.(n+1) into a 5.1.n installation. When fixing b), I have verified that the superfluous arguments were not used in the format in the first 5.1 GA (5.1.30 'bteam@astra04-20081114162938-z8mctjp6st27uobm'). Had they been used, then passing them today, even if the message doesn't use them anymore, would have been necessary, as explained above.
204 lines
5.8 KiB
C++
204 lines
5.8 KiB
C++
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
/**
|
|
@file
|
|
|
|
@brief
|
|
Read language depeneded messagefile
|
|
*/
|
|
|
|
#include "mysql_priv.h"
|
|
#include "mysys_err.h"
|
|
|
|
static bool read_texts(const char *file_name,const char ***point,
|
|
uint error_messages);
|
|
static void init_myfunc_errs(void);
|
|
|
|
/**
|
|
Read messages from errorfile.
|
|
|
|
This function can be called multiple times to reload the messages.
|
|
If it fails to load the messages, it will fail softly by initializing
|
|
the errmesg pointer to an array of empty strings or by keeping the
|
|
old array if it exists.
|
|
|
|
@retval
|
|
FALSE OK
|
|
@retval
|
|
TRUE Error
|
|
*/
|
|
|
|
bool init_errmessage(void)
|
|
{
|
|
const char **errmsgs, **ptr;
|
|
DBUG_ENTER("init_errmessage");
|
|
|
|
/*
|
|
Get a pointer to the old error messages pointer array.
|
|
read_texts() tries to free it.
|
|
*/
|
|
errmsgs= my_error_unregister(ER_ERROR_FIRST, ER_ERROR_LAST);
|
|
|
|
/* Read messages from file. */
|
|
if (read_texts(ERRMSG_FILE, &errmsgs, ER_ERROR_LAST - ER_ERROR_FIRST + 1) &&
|
|
!errmsgs)
|
|
{
|
|
if (!(errmsgs= (const char**) my_malloc((ER_ERROR_LAST-ER_ERROR_FIRST+1)*
|
|
sizeof(char*), MYF(0))))
|
|
DBUG_RETURN(TRUE);
|
|
for (ptr= errmsgs; ptr < errmsgs + ER_ERROR_LAST - ER_ERROR_FIRST; ptr++)
|
|
*ptr= "";
|
|
}
|
|
|
|
/* Register messages for use with my_error(). */
|
|
if (my_error_register(errmsgs, ER_ERROR_FIRST, ER_ERROR_LAST))
|
|
{
|
|
x_free((uchar*) errmsgs);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
errmesg= errmsgs; /* Init global variabel */
|
|
init_myfunc_errs(); /* Init myfunc messages */
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/**
|
|
Read text from packed textfile in language-directory.
|
|
|
|
If we can't read messagefile then it's panic- we can't continue.
|
|
|
|
@todo
|
|
Convert the character set to server system character set
|
|
*/
|
|
|
|
static bool read_texts(const char *file_name,const char ***point,
|
|
uint error_messages)
|
|
{
|
|
register uint i;
|
|
uint count,funktpos,textcount;
|
|
size_t length;
|
|
File file;
|
|
char name[FN_REFLEN];
|
|
uchar *buff;
|
|
uchar head[32],*pos;
|
|
DBUG_ENTER("read_texts");
|
|
|
|
LINT_INIT(buff);
|
|
funktpos=0;
|
|
if ((file=my_open(fn_format(name,file_name,language,"",4),
|
|
O_RDONLY | O_SHARE | O_BINARY,
|
|
MYF(0))) < 0)
|
|
goto err; /* purecov: inspected */
|
|
|
|
funktpos=1;
|
|
if (my_read(file,(uchar*) head,32,MYF(MY_NABP))) goto err;
|
|
if (head[0] != (uchar) 254 || head[1] != (uchar) 254 ||
|
|
head[2] != 2 || head[3] != 1)
|
|
goto err; /* purecov: inspected */
|
|
textcount=head[4];
|
|
|
|
if (!head[30])
|
|
{
|
|
sql_print_error("Character set information not found in '%s'. \
|
|
Please install the latest version of this file.",name);
|
|
goto err1;
|
|
}
|
|
|
|
/* TODO: Convert the character set to server system character set */
|
|
if (!get_charset(head[30],MYF(MY_WME)))
|
|
{
|
|
sql_print_error("Character set #%d is not supported for messagefile '%s'",
|
|
(int)head[30],name);
|
|
goto err1;
|
|
}
|
|
|
|
length=uint2korr(head+6); count=uint2korr(head+8);
|
|
|
|
if (count < error_messages)
|
|
{
|
|
sql_print_error("\
|
|
Error message file '%s' had only %d error messages,\n\
|
|
but it should contain at least %d error messages.\n\
|
|
Check that the above file is the right version for this program!",
|
|
name,count,error_messages);
|
|
VOID(my_close(file,MYF(MY_WME)));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
x_free((uchar*) *point); /* Free old language */
|
|
if (!(*point= (const char**)
|
|
my_malloc((size_t) (length+count*sizeof(char*)),MYF(0))))
|
|
{
|
|
funktpos=2; /* purecov: inspected */
|
|
goto err; /* purecov: inspected */
|
|
}
|
|
buff= (uchar*) (*point + count);
|
|
|
|
if (my_read(file, buff, (size_t) count*2,MYF(MY_NABP)))
|
|
goto err;
|
|
for (i=0, pos= buff ; i< count ; i++)
|
|
{
|
|
(*point)[i]= (char*) buff+uint2korr(pos);
|
|
pos+=2;
|
|
}
|
|
if (my_read(file, buff, length, MYF(MY_NABP)))
|
|
goto err;
|
|
|
|
for (i=1 ; i < textcount ; i++)
|
|
{
|
|
point[i]= *point +uint2korr(head+10+i+i);
|
|
}
|
|
VOID(my_close(file,MYF(0)));
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
sql_print_error((funktpos == 2) ? "Not enough memory for messagefile '%s'" :
|
|
((funktpos == 1) ? "Can't read from messagefile '%s'" :
|
|
"Can't find messagefile '%s'"), name);
|
|
err1:
|
|
if (file != FERR)
|
|
VOID(my_close(file,MYF(MY_WME)));
|
|
DBUG_RETURN(1);
|
|
} /* read_texts */
|
|
|
|
|
|
/**
|
|
Initiates error-messages used by my_func-library.
|
|
*/
|
|
|
|
static void init_myfunc_errs()
|
|
{
|
|
init_glob_errs(); /* Initiate english errors */
|
|
if (!(specialflag & SPECIAL_ENGLISH))
|
|
{
|
|
EE(EE_FILENOTFOUND) = ER(ER_FILE_NOT_FOUND);
|
|
EE(EE_CANTCREATEFILE) = ER(ER_CANT_CREATE_FILE);
|
|
EE(EE_READ) = ER(ER_ERROR_ON_READ);
|
|
EE(EE_WRITE) = ER(ER_ERROR_ON_WRITE);
|
|
EE(EE_BADCLOSE) = ER(ER_ERROR_ON_CLOSE);
|
|
EE(EE_OUTOFMEMORY) = ER(ER_OUTOFMEMORY);
|
|
EE(EE_DELETE) = ER(ER_CANT_DELETE_FILE);
|
|
EE(EE_LINK) = ER(ER_ERROR_ON_RENAME);
|
|
EE(EE_EOFERR) = ER(ER_UNEXPECTED_EOF);
|
|
EE(EE_CANTLOCK) = ER(ER_CANT_LOCK);
|
|
EE(EE_DIR) = ER(ER_CANT_READ_DIR);
|
|
EE(EE_STAT) = ER(ER_CANT_GET_STAT);
|
|
EE(EE_GETWD) = ER(ER_CANT_GET_WD);
|
|
EE(EE_SETWD) = ER(ER_CANT_SET_WD);
|
|
EE(EE_DISK_FULL) = ER(ER_DISK_FULL);
|
|
}
|
|
}
|