database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Bug #29469: Client dies if a query is issued after hitting Ctrl + C

Browse Source 
The Ctrl-C handler in mysql closes the console while ReadConsole()
waits for console input.
But the main thread was detecting that ReadConsole() haven't read 
anything and was processing as if there're data in the buffer.
Fixed to handle correctly this error condition.
No test case added as the test relies on Ctrl-C sent to the client
from its console.
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2007-07-10 10:43:12 +03:00
parent 7cab171f64
commit 7735a2f2eb
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysql.cc
View File

@@ -1086,6 +1086,11 @@ static int read_and_execute(bool interactive)
something else is still in console input buffer something else is still in console input buffer
*/ */
} while (tmpbuf.alloced_length() <= clen); } while (tmpbuf.alloced_length() <= clen);
/*
An empty line is returned from my_cgets when there's error reading :
Ctrl-c for example
*/
if (line)
line= buffer.c_ptr(); line= buffer.c_ptr();
#else /* OS2 */ #else /* OS2 */
buffer.length(0); buffer.length(0);

7
mysys/my_conio.c
View File

@@ -184,16 +184,19 @@ char* my_cgets(char *buffer, unsigned long clen, unsigned long* plen)
} }
while (GetLastError() == ERROR_NOT_ENOUGH_MEMORY); while (GetLastError() == ERROR_NOT_ENOUGH_MEMORY);
/* We go here on error reading the string (Ctrl-C for example) */
if (!*plen)
result= NULL; /* purecov: inspected */
if (result != NULL) if (result != NULL)
{ {
if (buffer[*plen - 2] == '\r') if (*plen > 1 && buffer[*plen - 2] == '\r')
{ {
*plen= *plen - 2; *plen= *plen - 2;
} }
else else
{ {
if (buffer[*plen - 1] == '\r') if (*plen > 0 && buffer[*plen - 1] == '\r')
{ {
char tmp[3]; char tmp[3];
int tmplen= sizeof(tmp); int tmplen= sizeof(tmp);