mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
more accurate processing of find_type result
(Bug #4998 --protocol doesn't reject bad values)
This commit is contained in:
parent
237615bc53
commit
ffacc77f22
8 changed files with 9 additions and 10 deletions
|
@ -753,7 +753,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
opt_nopager= 1;
|
||||
case OPT_MYSQL_PROTOCOL:
|
||||
{
|
||||
if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
|
||||
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
|
||||
exit(1);
|
||||
|
|
|
@ -249,7 +249,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
break;
|
||||
case OPT_MYSQL_PROTOCOL:
|
||||
{
|
||||
if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
|
||||
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
|
||||
exit(1);
|
||||
|
|
|
@ -633,7 +633,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
break;
|
||||
case OPT_MYSQL_PROTOCOL:
|
||||
{
|
||||
if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
|
||||
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
|
||||
exit(1);
|
||||
|
|
|
@ -271,7 +271,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
case 'V': print_version(); exit(0);
|
||||
case OPT_MYSQL_PROTOCOL:
|
||||
{
|
||||
if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
|
||||
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
|
||||
exit(1);
|
||||
|
|
|
@ -582,7 +582,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
}
|
||||
case (int) OPT_MYSQL_PROTOCOL:
|
||||
{
|
||||
if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
|
||||
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
|
||||
exit(1);
|
||||
|
|
|
@ -203,7 +203,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
#endif
|
||||
case OPT_MYSQL_PROTOCOL:
|
||||
{
|
||||
if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
|
||||
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
|
||||
exit(1);
|
||||
|
|
|
@ -268,7 +268,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
break;
|
||||
case OPT_MYSQL_PROTOCOL:
|
||||
{
|
||||
if (!(opt_protocol= find_type(argument, &sql_protocol_typelib,0)))
|
||||
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
|
||||
exit(1);
|
||||
|
|
|
@ -1057,9 +1057,8 @@ void mysql_read_default_options(struct st_mysql_options *options,
|
|||
options->max_allowed_packet= atoi(opt_arg);
|
||||
break;
|
||||
case 28: /* protocol */
|
||||
if ((options->protocol = find_type(opt_arg,
|
||||
&sql_protocol_typelib,0))
|
||||
== ~(ulong) 0)
|
||||
if ((options->protocol= find_type(opt_arg,
|
||||
&sql_protocol_typelib,0)) <= 0)
|
||||
{
|
||||
fprintf(stderr, "Unknown option to protocol: %s\n", opt_arg);
|
||||
exit(1);
|
||||
|
|
Loading…
Add table
Reference in a new issue