mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SOCK_get_next_byte should not return garbage after error/EOF. Return

Browse Source 
zero bytes instead.
This commit is contained in:
Tom Lane 2001-02-11 23:46:40 +00:00
parent 07faa2fdce
commit d9eb5b75e3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/interfaces/odbc/socket.c
View File

@ -286,7 +286,7 @@ SOCK_get_next_byte(SocketClass *self)
{ {
if (self->buffer_read_in >= self->buffer_filled_in) if (self->buffer_read_in >= self->buffer_filled_in)
{ {
/* there are no more bytes left in the buffer -> */ /* there are no more bytes left in the buffer, so */
/* reload the buffer */ /* reload the buffer */
self->buffer_read_in = 0; self->buffer_read_in = 0;
@ -296,17 +296,19 @@ SOCK_get_next_byte(SocketClass *self)
mylog("read %d, global_socket_buffersize=%d\n", mylog("read %d, global_socket_buffersize=%d\n",
self->buffer_filled_in, globals.socket_buffersize); self->buffer_filled_in, globals.socket_buffersize);
if (self->buffer_filled_in == -1) if (self->buffer_filled_in < 0)
{ {
self->errornumber = SOCKET_READ_ERROR; self->errornumber = SOCKET_READ_ERROR;
self->errormsg = "Error while reading from the socket."; self->errormsg = "Error while reading from the socket.";
self->buffer_filled_in = 0; self->buffer_filled_in = 0;
return 0;
} }
if (self->buffer_filled_in == 0) if (self->buffer_filled_in == 0)
{ {
self->errornumber = SOCKET_CLOSED; self->errornumber = SOCKET_CLOSED;
self->errormsg = "Socket has been closed."; self->errormsg = "Socket has been closed.";
self->buffer_filled_in = 0; self->buffer_filled_in = 0;
return 0;
} }
} }
return self->buffer_in[self->buffer_read_in++]; return self->buffer_in[self->buffer_read_in++];