Skip to content

Improve the handling of anomalies #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SkyMoonDyy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve the handling of anomalies #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 38 additions & 4 deletions c/src/stomp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ APR_DECLARE(apr_status_t) stomp_read_buffer(stomp_connection *connection, char *
// Keep reading bytes till end of frame is encountered.
while( 1 ) {

char is_failed = 0;
apr_size_t length = 1;
apr_status_t rc = apr_socket_recv(connection->socket, tail->data+i, &length);
CHECK_SUCCESS;
Expand All @@ -237,8 +238,11 @@ APR_DECLARE(apr_status_t) stomp_read_buffer(stomp_connection *connection, char *
apr_socket_recv(connection->socket, endline, &length);
CHECK_SUCCESS;
if( endline[0] != '\n' ) {
return APR_EGENERAL;
// add by skymoondyy; used to skip error bytes till real end of frame
is_failed = 1;
continue;
}
if (is_failed) return APR_EGENERAL;
break;
}

Expand Down Expand Up @@ -415,14 +419,44 @@ APR_DECLARE(apr_status_t) stomp_read(stomp_connection *connection, stomp_frame *

f->body_length = atoi(content_length);
f->body = apr_pcalloc(pool, f->body_length);
rc = apr_socket_recv(connection->socket, f->body, &f->body_length);
CHECK_SUCCESS;
int seek = 0;
apr_size_t len = f->body_length;
// modify by skymoondyy, read till finish
while(1)
{
rc = apr_socket_recv(connection->socket, (void*)f->body+seek, (apr_size_t *)&len);
CHECK_SUCCESS;
if((seek+len) < f->body_length)
{
seek += len;
len = f->body_length - seek;
continue;
}else
{
break;
}
}

// Expect a \n after the end
/*
rc = apr_socket_recv(connection->socket, endbuffer, &length);
CHECK_SUCCESS;
if(length != 2 || endbuffer[0] != '\0' || endbuffer[1] != '\n')
return APR_EGENERAL;
*/
//fixed by skymoondyy change read 2 byte once to read 1 byte twice
length = 1;
rc = apr_socket_recv(connection->socket, endbuffer, &length);
CHECK_SUCCESS;
if(length == 1)
{
rc = apr_socket_recv(connection->socket, endbuffer+1, &length);
}
if(length != 1 || endbuffer[0] != '\0' || endbuffer[1] != '\n')
{
return APR_EGENERAL;
}

}
else
{
Expand All @@ -436,4 +470,4 @@ APR_DECLARE(apr_status_t) stomp_read(stomp_connection *connection, stomp_frame *
#undef CHECK_SUCCESS
*frame = f;
return APR_SUCCESS;
}
}