psyc-mirrors/libpsyc
1
0
Fork 0
mirror of git://git.psyc.eu/libpsyc synced 2024-08-15 03:19:02 +00:00
Code Issues Releases Wiki Activity

proper handling of method and data

Browse source
This commit is contained in:
Marenz 2010-02-20 23:06:33 +01:00
parent bae324db5f
commit a2aca6a698
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/parser.c
View file

@ -289,16 +289,23 @@ inline int PSYC_parseElement(
* for the method: after the \n data follows, * for the method: after the \n data follows,
* which is anything but \n|\n * which is anything but \n|\n
* *
* but data is optional, so we first check
* here if data follows at all.
*
* arg-data=*value. we set value here so it * arg-data=*value. we set value here so it
* points to a valid range and so we point * points to a valid range and so we point
* to the first potential arg-data byte. * to the first potential arg-data byte.
* If there is no arg-data, we still have * If there is no arg-data, we still have
* the length attribute on 0. */ * the length attribute on 0. */
if(method == 0 && data[*cursor] == '\n') // emptyvar if((method == 0 && data[*cursor] == '\n') /* emptyvar */ ||
(method == 1 && *cursor+2 < dlength &&
data[*cursor+1] == '|' &&
data[*cursor+2] == '\n') /*no data */ )
{ {
*value=data+*cursor; *value=data+*cursor;
*vlength=0; *vlength=0;
}else }
else
{ {
*value=data+*cursor+1; *value=data+*cursor+1;
if(1== complete) // we know the length of the packet if(1== complete) // we know the length of the packet
@ -318,23 +325,26 @@ inline int PSYC_parseElement(
if(0 == method && data[*cursor] == '\n') if(0 == method && data[*cursor] == '\n')
break; break;
if(1 == method && data[*cursor] == '|') if(1 == method && data[*cursor] == '\n')
{ {
if(dlength<=++(*cursor)) // incremented cursor inside lenght? if(dlength<=(*cursor)+2) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value *cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
/* packet finishes here */ if(data[*cursor+1] == '|')
if(data[*cursor] == '\n') if(data[*cursor+2] == '\n')
{ {
*cursor+=1; /* packet finishes here */
return 3; *cursor+=3;
} return 3;
}
} }
++(*vlength); ++(*vlength);
}} }
}
} }
}else if(inHeader == 0 && method==0 && data[*cursor] == ' ') // oi, its a binary var! }else if(inHeader == 0 && method==0 && data[*cursor] == ' ') // oi, its a binary var!
{ // after SP the length follows. { // after SP the length follows.