From: kubistika <kmizrachi18@gmail.com>
Date: Tue, 12 Nov 2019 11:22:45 +0000 (+0200)
Subject: cliprdr: common: fix validation of file contents request pdu
X-Git-Tag: 2.0.0~267
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=511f89cd99b60c5e755d5030c86df0d673a756de;p=platform%2Fupstream%2Ffreerdp.git

cliprdr: common: fix validation of file contents request pdu
---

diff --git a/channels/cliprdr/cliprdr_common.c b/channels/cliprdr/cliprdr_common.c
index 9a09942..ebe0d6a 100644
--- a/channels/cliprdr/cliprdr_common.c
+++ b/channels/cliprdr/cliprdr_common.c
@@ -352,9 +352,6 @@ UINT cliprdr_read_format_data_response(wStream* s, CLIPRDR_FORMAT_DATA_RESPONSE*
 
 UINT cliprdr_read_file_contents_request(wStream* s, CLIPRDR_FILE_CONTENTS_REQUEST* request)
 {
-	if (!cliprdr_validate_file_contents_request(request))
-		return ERROR_BAD_ARGUMENTS;
-
 	if (Stream_GetRemainingLength(s) < 24)
 	{
 		WLog_ERR(TAG, "not enough remaining data");
@@ -375,6 +372,9 @@ UINT cliprdr_read_file_contents_request(wStream* s, CLIPRDR_FILE_CONTENTS_REQUES
 		request->haveClipDataId = TRUE;
 	}
 
+	if (!cliprdr_validate_file_contents_request(request))
+		return ERROR_BAD_ARGUMENTS;
+
 	return CHANNEL_RC_OK;
 }