Fix CB_FILECONTENTS_REQUEST message decoding.

Do not require optional fields to be present as required by
[MS-RDPECLIP] 2.2.5.3 File Contents Request PDU (CLIPRDR_FILECONTENTS_REQUEST)

diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c
index 21fb784..7ca0c94 100644 (file)
--- a/channels/cliprdr/client/cliprdr_main.c
+++ b/channels/cliprdr/client/cliprdr_main.c
@@ -310,9 +310,9 @@ static UINT cliprdr_process_filecontents_request(cliprdrPlugin* cliprdr, wStream
                return ERROR_INTERNAL_ERROR;
        }
 
-       if (Stream_GetRemainingLength(s) < 28)
+       if (Stream_GetRemainingLength(s) < 24)
        {
-               WLog_ERR(TAG, "not enought remaining data");
+               WLog_ERR(TAG, "not enough remaining data");
                return ERROR_INVALID_DATA;
        }
 
@@ -326,7 +326,10 @@ static UINT cliprdr_process_filecontents_request(cliprdrPlugin* cliprdr, wStream
        Stream_Read_UINT32(s, request.nPositionLow); /* nPositionLow (4 bytes) */
        Stream_Read_UINT32(s, request.nPositionHigh); /* nPositionHigh (4 bytes) */
        Stream_Read_UINT32(s, request.cbRequested); /* cbRequested (4 bytes) */
-       Stream_Read_UINT32(s, request.clipDataId); /* clipDataId (4 bytes) */
+       if (Stream_GetRemainingLength(s) >= 4)
+               Stream_Read_UINT32(s, request.clipDataId); /* clipDataId (4 bytes) */
+       else
+               request.clipDataId = 0;
 
 
        IFCALLRET(context->ServerFileContentsRequest, error, context, &request);
@@ -357,7 +360,7 @@ static UINT cliprdr_process_filecontents_response(cliprdrPlugin* cliprdr, wStrea
 
        if (Stream_GetRemainingLength(s) < 4)
        {
-               WLog_ERR(TAG, "not enought remaining data");
+               WLog_ERR(TAG, "not enough remaining data");
                return ERROR_INVALID_DATA;
        }
 
@@ -399,7 +402,7 @@ static UINT cliprdr_process_lock_clipdata(cliprdrPlugin* cliprdr, wStream* s, UI
 
        if (Stream_GetRemainingLength(s) < 4)
        {
-               WLog_ERR(TAG, "not enought remaining data");
+               WLog_ERR(TAG, "not enough remaining data");
                return ERROR_INVALID_DATA;
        }
 
@@ -437,7 +440,7 @@ static UINT cliprdr_process_unlock_clipdata(cliprdrPlugin* cliprdr, wStream* s,
 
        if (Stream_GetRemainingLength(s) < 4)
        {
-               WLog_ERR(TAG, "not enought remaining data");
+               WLog_ERR(TAG, "not enough remaining data");
                return ERROR_INVALID_DATA;
        }
 

diff --git a/channels/cliprdr/server/cliprdr_main.c b/channels/cliprdr/server/cliprdr_main.c
index ed98170..3baa905 100644 (file)
--- a/channels/cliprdr/server/cliprdr_main.c
+++ b/channels/cliprdr/server/cliprdr_main.c
@@ -849,7 +849,7 @@ static UINT cliprdr_server_receive_lock_clipdata(CliprdrServerContext* context,
 
        if (Stream_GetRemainingLength(s) < 4)
        {
-               WLog_ERR(TAG, "not enought data in stream!");
+               WLog_ERR(TAG, "not enough data in stream!");
                return ERROR_INVALID_DATA;
        }
 
@@ -884,7 +884,7 @@ static UINT cliprdr_server_receive_unlock_clipdata(CliprdrServerContext* context
 
        if (Stream_GetRemainingLength(s) < 4)
        {
-               WLog_ERR(TAG, "not enought data in stream!");
+               WLog_ERR(TAG, "not enough data in stream!");
                return ERROR_INVALID_DATA;
        }
 
@@ -915,7 +915,7 @@ static UINT cliprdr_server_receive_format_data_request(CliprdrServerContext* con
 
        if (Stream_GetRemainingLength(s) < 4)
        {
-               WLog_ERR(TAG, "not enought data in stream!");
+               WLog_ERR(TAG, "not enough data in stream!");
                return ERROR_INVALID_DATA;
        }
 
@@ -947,7 +947,7 @@ static UINT cliprdr_server_receive_format_data_response(CliprdrServerContext* co
 
        if (Stream_GetRemainingLength(s) < header->dataLen)
        {
-               WLog_ERR(TAG, "not enought data in stream!");
+               WLog_ERR(TAG, "not enough data in stream!");
                return ERROR_INVALID_DATA;
        }
 
@@ -984,7 +984,7 @@ static UINT cliprdr_server_receive_filecontents_request(CliprdrServerContext* co
 
        if (Stream_GetRemainingLength(s) < 24)
        {
-               WLog_ERR(TAG, "not enought data in stream!");
+               WLog_ERR(TAG, "not enough data in stream!");
                return ERROR_INVALID_DATA;
        }
 
@@ -1024,7 +1024,7 @@ static UINT cliprdr_server_receive_filecontents_response(CliprdrServerContext* c
 
        if (Stream_GetRemainingLength(s) < 4)
        {
-               WLog_ERR(TAG, "not enought data in stream!");
+               WLog_ERR(TAG, "not enough data in stream!");
                return ERROR_INVALID_DATA;
        }