Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pATyp-0004JK-P3 for pgsql-hackers@arkaria.postgresql.org; Wed, 28 Dec 2022 10:48:16 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1pATxp-0006QI-H0 for pgsql-hackers@arkaria.postgresql.org; Wed, 28 Dec 2022 10:47:13 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pATxo-0006Q9-7D for pgsql-hackers@lists.postgresql.org; Wed, 28 Dec 2022 10:47:13 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pATxk-0000C6-3X for pgsql-hackers@postgresql.org; Wed, 28 Dec 2022 10:47:11 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id A87A52B0686B for ; Wed, 28 Dec 2022 05:47:05 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 28 Dec 2022 05:47:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:message-id:mime-version :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1672224425; x= 1672231625; bh=orWHXGj9vcyAj+ML4cfu/vDImZWNa1VGhZzOhGvp6zE=; b=G egAsbepuxnz6s1sXQ0wxN2+iy84EhCSBnJEZW5p9JyAwdXyBXI8l19XKI21DNJgO L52WGsjVP897zWZryU0HoS0/KL24TVLpCqoB2mYFeWv2HYFJz/5o2C3A8SMQhCsL 5Du8EifKhxpb4+uT5NXCemOkFw5Na1rVmSpuUlK5UIN80wArnDt1DKw997ZSugA3 vK9tprnfEWyHc81KhCslx0a2hXsXw3pPDGOXcDjsCgBGyQL+du73zYXRVmaXpaZb BdKIpDuxttWsdegwHSLBIbMsNK6fPHVUXymXV4ih0AxSqtPViY98xPbry0Cl/00L qvlm1Y+gDKkIgP07aPKuw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedriedvgddulecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurheptgfkffggfgfhuffvsehmtderredtfe ejnecuhfhrohhmpefrvghtvghrucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgvihhs vghnthhrrghuthesvghnthgvrhhprhhishgvuggsrdgtohhmqeenucggtffrrghtthgvrh hnpeetveeuvdeikeeigefhveffhffhvdejveelleefieekieekvdffgeetkedutdefleen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpvghtvg hrrdgvihhsvghnthhrrghuthesvghnthgvrhhprhhishgvuggsrdgtohhm X-ME-Proxy: Feedback-ID: i131946ab:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 28 Dec 2022 05:47:04 -0500 (EST) Content-Type: multipart/mixed; boundary="------------khiV72B0dwcahqJMhgPPwsrQ" Message-ID: Date: Wed, 28 Dec 2022 11:47:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US From: Peter Eisentraut Subject: Add BufFileRead variants with short read and EOF detection To: pgsql-hackers List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------khiV72B0dwcahqJMhgPPwsrQ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Most callers of BufFileRead() want to check whether they read the full specified length. Checking this at every call site is very tedious. This patch provides additional variants BufFileReadExact() and BufFileReadMaybeEOF() that include the length checks. I considered changing BufFileRead() itself, but this function is also used in extensions, and so changing the behavior like this would create a lot of problems there. The new names are analogous to the existing LogicalTapeReadExact(). --------------khiV72B0dwcahqJMhgPPwsrQ Content-Type: text/plain; charset=UTF-8; name="0001-Add-BufFileRead-variants-with-short-read-and-EOF-det.patch" Content-Disposition: attachment; filename*0="0001-Add-BufFileRead-variants-with-short-read-and-EOF-det.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBjNDBlZTkyMGY5MzFkNDJiNjkzMzhjNzc3NjM5MjAwYmFmYmVlODA1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAyOCBEZWMgMjAyMiAxMTo0NjoxNCArMDEwMApTdWJqZWN0 OiBbUEFUQ0hdIEFkZCBCdWZGaWxlUmVhZCB2YXJpYW50cyB3aXRoIHNob3J0IHJlYWQgYW5k IEVPRiBkZXRlY3Rpb24KCk1vc3QgY2FsbGVycyBvZiBCdWZGaWxlUmVhZCgpIHdhbnQgdG8g Y2hlY2sgd2hldGhlciB0aGV5IHJlYWQgdGhlIGZ1bGwKc3BlY2lmaWVkIGxlbmd0aC4gIENo ZWNraW5nIHRoaXMgYXQgZXZlcnkgY2FsbCBzaXRlIGlzIHZlcnkgdGVkaW91cy4KVGhpcyBw YXRjaCBwcm92aWRlcyBhZGRpdGlvbmFsIHZhcmlhbnRzIEJ1ZkZpbGVSZWFkRXhhY3QoKSBh bmQKQnVmRmlsZVJlYWRNYXliZUVPRigpIHRoYXQgaW5jbHVkZSB0aGUgbGVuZ3RoIGNoZWNr cy4KCkkgY29uc2lkZXJlZCBjaGFuZ2luZyBCdWZGaWxlUmVhZCgpIGl0c2VsZiwgYnV0IHRo aXMgZnVuY3Rpb24gaXMgYWxzbwp1c2VkIGluIGV4dGVuc2lvbnMsIGFuZCBzbyBjaGFuZ2lu ZyB0aGUgYmVoYXZpb3IgbGlrZSB0aGlzIHdvdWxkCmNyZWF0ZSBhIGxvdCBvZiBwcm9ibGVt cyB0aGVyZS4gIFRoZSBuZXcgbmFtZXMgYXJlIGFuYWxvZ291cyB0byB0aGUKZXhpc3Rpbmcg TG9naWNhbFRhcGVSZWFkRXhhY3QoKS4KLS0tCiBzcmMvYmFja2VuZC9hY2Nlc3MvZ2lzdC9n aXN0YnVpbGRidWZmZXJzLmMgfCAgNyArLS0tCiBzcmMvYmFja2VuZC9iYWNrdXAvYmFja3Vw X21hbmlmZXN0LmMgICAgICAgfCAgOCArLS0tCiBzcmMvYmFja2VuZC9leGVjdXRvci9ub2Rl SGFzaGpvaW4uYyAgICAgICAgfCAxOCArKy0tLS0tLQogc3JjL2JhY2tlbmQvcmVwbGljYXRp b24vbG9naWNhbC93b3JrZXIuYyAgIHwgMjkgKysrLS0tLS0tLS0tLQogc3JjL2JhY2tlbmQv c3RvcmFnZS9maWxlL2J1ZmZpbGUuYyAgICAgICAgIHwgNDcgKysrKysrKysrKysrKysrKysr Ky0tCiBzcmMvYmFja2VuZC91dGlscy9zb3J0L2xvZ3RhcGUuYyAgICAgICAgICAgfCAgOSAr LS0tCiBzcmMvYmFja2VuZC91dGlscy9zb3J0L3NoYXJlZHR1cGxlc3RvcmUuYyAgfCA0OSAr KystLS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvYmFja2VuZC91dGlscy9zb3J0L3R1cGxlc3Rv cmUuYyAgICAgICAgfCAyOSArKystLS0tLS0tLS0tCiBzcmMvaW5jbHVkZS9zdG9yYWdlL2J1 ZmZpbGUuaCAgICAgICAgICAgICAgfCAgNCArLQogOSBmaWxlcyBjaGFuZ2VkLCA3MSBpbnNl cnRpb25zKCspLCAxMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQv YWNjZXNzL2dpc3QvZ2lzdGJ1aWxkYnVmZmVycy5jIGIvc3JjL2JhY2tlbmQvYWNjZXNzL2dp c3QvZ2lzdGJ1aWxkYnVmZmVycy5jCmluZGV4IDUzOGUzODgwYzkuLmJlZjk4YjI5MmQgMTAw NjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2FjY2Vzcy9naXN0L2dpc3RidWlsZGJ1ZmZlcnMuYwor KysgYi9zcmMvYmFja2VuZC9hY2Nlc3MvZ2lzdC9naXN0YnVpbGRidWZmZXJzLmMKQEAgLTc1 MywxNCArNzUzLDkgQEAgZ2lzdFJlbG9jYXRlQnVpbGRCdWZmZXJzT25TcGxpdChHSVNUQnVp bGRCdWZmZXJzICpnZmJiLCBHSVNUU1RBVEUgKmdpc3RzdGF0ZSwKIHN0YXRpYyB2b2lkCiBS ZWFkVGVtcEZpbGVCbG9jayhCdWZGaWxlICpmaWxlLCBsb25nIGJsa251bSwgdm9pZCAqcHRy KQogewotCXNpemVfdAkJbnJlYWQ7Ci0KIAlpZiAoQnVmRmlsZVNlZWtCbG9jayhmaWxlLCBi bGtudW0pICE9IDApCiAJCWVsb2coRVJST1IsICJjb3VsZCBub3Qgc2VlayB0byBibG9jayAl bGQgaW4gdGVtcG9yYXJ5IGZpbGUiLCBibGtudW0pOwotCW5yZWFkID0gQnVmRmlsZVJlYWQo ZmlsZSwgcHRyLCBCTENLU1opOwotCWlmIChucmVhZCAhPSBCTENLU1opCi0JCWVsb2coRVJS T1IsICJjb3VsZCBub3QgcmVhZCB0ZW1wb3JhcnkgZmlsZTogcmVhZCBvbmx5ICV6dSBvZiAl enUgYnl0ZXMiLAotCQkJIG5yZWFkLCAoc2l6ZV90KSBCTENLU1opOworCUJ1ZkZpbGVSZWFk RXhhY3QoZmlsZSwgcHRyLCBCTENLU1opOwogfQogCiBzdGF0aWMgdm9pZApkaWZmIC0tZ2l0 IGEvc3JjL2JhY2tlbmQvYmFja3VwL2JhY2t1cF9tYW5pZmVzdC5jIGIvc3JjL2JhY2tlbmQv YmFja3VwL2JhY2t1cF9tYW5pZmVzdC5jCmluZGV4IGE1NDE4NWZkYWIuLmFlMjA3Nzc5NGYg MTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2JhY2t1cC9iYWNrdXBfbWFuaWZlc3QuYworKysg Yi9zcmMvYmFja2VuZC9iYWNrdXAvYmFja3VwX21hbmlmZXN0LmMKQEAgLTM2MiwxNiArMzYy LDEwIEBAIFNlbmRCYWNrdXBNYW5pZmVzdChiYWNrdXBfbWFuaWZlc3RfaW5mbyAqbWFuaWZl c3QsIGJic2luayAqc2luaykKIAl3aGlsZSAobWFuaWZlc3RfYnl0ZXNfZG9uZSA8IG1hbmlm ZXN0LT5tYW5pZmVzdF9zaXplKQogCXsKIAkJc2l6ZV90CQlieXRlc190b19yZWFkOwotCQlz aXplX3QJCXJjOwogCiAJCWJ5dGVzX3RvX3JlYWQgPSBNaW4oc2luay0+YmJzX2J1ZmZlcl9s ZW5ndGgsCiAJCQkJCQkJbWFuaWZlc3QtPm1hbmlmZXN0X3NpemUgLSBtYW5pZmVzdF9ieXRl c19kb25lKTsKLQkJcmMgPSBCdWZGaWxlUmVhZChtYW5pZmVzdC0+YnVmZmlsZSwgc2luay0+ YmJzX2J1ZmZlciwKLQkJCQkJCSBieXRlc190b19yZWFkKTsKLQkJaWYgKHJjICE9IGJ5dGVz X3RvX3JlYWQpCi0JCQllcmVwb3J0KEVSUk9SLAotCQkJCQkoZXJyY29kZV9mb3JfZmlsZV9h Y2Nlc3MoKSwKLQkJCQkJIGVycm1zZygiY291bGQgbm90IHJlYWQgZnJvbSB0ZW1wb3Jhcnkg ZmlsZTogJW0iKSkpOworCQlCdWZGaWxlUmVhZEV4YWN0KG1hbmlmZXN0LT5idWZmaWxlLCBz aW5rLT5iYnNfYnVmZmVyLCBieXRlc190b19yZWFkKTsKIAkJYmJzaW5rX21hbmlmZXN0X2Nv bnRlbnRzKHNpbmssIGJ5dGVzX3RvX3JlYWQpOwogCQltYW5pZmVzdF9ieXRlc19kb25lICs9 IGJ5dGVzX3RvX3JlYWQ7CiAJfQpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvZXhlY3V0b3Iv bm9kZUhhc2hqb2luLmMgYi9zcmMvYmFja2VuZC9leGVjdXRvci9ub2RlSGFzaGpvaW4uYwpp bmRleCAzZTFhOTk3ZjkyLi42MDVlMTJmZThjIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9l eGVjdXRvci9ub2RlSGFzaGpvaW4uYworKysgYi9zcmMvYmFja2VuZC9leGVjdXRvci9ub2Rl SGFzaGpvaW4uYwpAQCAtMTI2MCwyOCArMTI2MCwxOCBAQCBFeGVjSGFzaEpvaW5HZXRTYXZl ZFR1cGxlKEhhc2hKb2luU3RhdGUgKmhqc3RhdGUsCiAJICogd2UgY2FuIHJlYWQgdGhlbSBi b3RoIGluIG9uZSBCdWZGaWxlUmVhZCgpIGNhbGwgd2l0aG91dCBhbnkgdHlwZQogCSAqIGNo ZWF0aW5nLgogCSAqLwotCW5yZWFkID0gQnVmRmlsZVJlYWQoZmlsZSwgaGVhZGVyLCBzaXpl b2YoaGVhZGVyKSk7CisJbnJlYWQgPSBCdWZGaWxlUmVhZE1heWJlRU9GKGZpbGUsIGhlYWRl ciwgc2l6ZW9mKGhlYWRlciksIHRydWUpOwogCWlmIChucmVhZCA9PSAwKQkJCQkvKiBlbmQg b2YgZmlsZSAqLwogCXsKIAkJRXhlY0NsZWFyVHVwbGUodHVwbGVTbG90KTsKIAkJcmV0dXJu IE5VTEw7CiAJfQotCWlmIChucmVhZCAhPSBzaXplb2YoaGVhZGVyKSkKLQkJZXJlcG9ydChF UlJPUiwKLQkJCQkoZXJyY29kZV9mb3JfZmlsZV9hY2Nlc3MoKSwKLQkJCQkgZXJybXNnKCJj b3VsZCBub3QgcmVhZCBmcm9tIGhhc2gtam9pbiB0ZW1wb3JhcnkgZmlsZTogcmVhZCBvbmx5 ICV6dSBvZiAlenUgYnl0ZXMiLAotCQkJCQkJbnJlYWQsIHNpemVvZihoZWFkZXIpKSkpOwog CSpoYXNodmFsdWUgPSBoZWFkZXJbMF07CiAJdHVwbGUgPSAoTWluaW1hbFR1cGxlKSBwYWxs b2MoaGVhZGVyWzFdKTsKIAl0dXBsZS0+dF9sZW4gPSBoZWFkZXJbMV07Ci0JbnJlYWQgPSBC dWZGaWxlUmVhZChmaWxlLAotCQkJCQkJKChjaGFyICopIHR1cGxlICsgc2l6ZW9mKHVpbnQz MikpLAotCQkJCQkJaGVhZGVyWzFdIC0gc2l6ZW9mKHVpbnQzMikpOwotCWlmIChucmVhZCAh PSBoZWFkZXJbMV0gLSBzaXplb2YodWludDMyKSkKLQkJZXJlcG9ydChFUlJPUiwKLQkJCQko ZXJyY29kZV9mb3JfZmlsZV9hY2Nlc3MoKSwKLQkJCQkgZXJybXNnKCJjb3VsZCBub3QgcmVh ZCBmcm9tIGhhc2gtam9pbiB0ZW1wb3JhcnkgZmlsZTogcmVhZCBvbmx5ICV6dSBvZiAlenUg Ynl0ZXMiLAotCQkJCQkJbnJlYWQsIGhlYWRlclsxXSAtIHNpemVvZih1aW50MzIpKSkpOwor CUJ1ZkZpbGVSZWFkRXhhY3QoZmlsZSwKKwkJCQkJIChjaGFyICopIHR1cGxlICsgc2l6ZW9m KHVpbnQzMiksCisJCQkJCSBoZWFkZXJbMV0gLSBzaXplb2YodWludDMyKSk7CiAJRXhlY0Zv cmNlU3RvcmVNaW5pbWFsVHVwbGUodHVwbGUsIHR1cGxlU2xvdCwgdHJ1ZSk7CiAJcmV0dXJu IHR1cGxlU2xvdDsKIH0KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xv Z2ljYWwvd29ya2VyLmMgYi9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3dvcmtl ci5jCmluZGV4IDk2NzcyZTRkNzMuLmE1MTkwOWJiYWQgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNr ZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvd29ya2VyLmMKKysrIGIvc3JjL2JhY2tlbmQvcmVw bGljYXRpb24vbG9naWNhbC93b3JrZXIuYwpAQCAtMTQzMiwxOSArMTQzMiwxMyBAQCBhcHBs eV9zcG9vbGVkX21lc3NhZ2VzKFRyYW5zYWN0aW9uSWQgeGlkLCBYTG9nUmVjUHRyIGxzbikK IAkJQ0hFQ0tfRk9SX0lOVEVSUlVQVFMoKTsKIAogCQkvKiByZWFkIGxlbmd0aCBvZiB0aGUg b24tZGlzayByZWNvcmQgKi8KLQkJbmJ5dGVzID0gQnVmRmlsZVJlYWQoZmQsICZsZW4sIHNp emVvZihsZW4pKTsKKwkJbmJ5dGVzID0gQnVmRmlsZVJlYWRNYXliZUVPRihmZCwgJmxlbiwg c2l6ZW9mKGxlbiksIHRydWUpOwogCiAJCS8qIGhhdmUgd2UgcmVhY2hlZCBlbmQgb2YgdGhl IGZpbGU/ICovCiAJCWlmIChuYnl0ZXMgPT0gMCkKIAkJCWJyZWFrOwogCiAJCS8qIGRvIHdl IGhhdmUgYSBjb3JyZWN0IGxlbmd0aD8gKi8KLQkJaWYgKG5ieXRlcyAhPSBzaXplb2YobGVu KSkKLQkJCWVyZXBvcnQoRVJST1IsCi0JCQkJCShlcnJjb2RlX2Zvcl9maWxlX2FjY2Vzcygp LAotCQkJCQkgZXJybXNnKCJjb3VsZCBub3QgcmVhZCBmcm9tIHN0cmVhbWluZyB0cmFuc2Fj dGlvbidzIGNoYW5nZXMgZmlsZSBcIiVzXCI6ICVtIiwKLQkJCQkJCQlwYXRoKSkpOwotCiAJ CWlmIChsZW4gPD0gMCkKIAkJCWVsb2coRVJST1IsICJpbmNvcnJlY3QgbGVuZ3RoICVkIGlu IHN0cmVhbWluZyB0cmFuc2FjdGlvbidzIGNoYW5nZXMgZmlsZSBcIiVzXCIiLAogCQkJCSBs ZW4sIHBhdGgpOwpAQCAtMTQ1MywxMSArMTQ0Nyw3IEBAIGFwcGx5X3Nwb29sZWRfbWVzc2Fn ZXMoVHJhbnNhY3Rpb25JZCB4aWQsIFhMb2dSZWNQdHIgbHNuKQogCQlidWZmZXIgPSByZXBh bGxvYyhidWZmZXIsIGxlbik7CiAKIAkJLyogYW5kIGZpbmFsbHkgcmVhZCB0aGUgZGF0YSBp bnRvIHRoZSBidWZmZXIgKi8KLQkJaWYgKEJ1ZkZpbGVSZWFkKGZkLCBidWZmZXIsIGxlbikg IT0gbGVuKQotCQkJZXJlcG9ydChFUlJPUiwKLQkJCQkJKGVycmNvZGVfZm9yX2ZpbGVfYWNj ZXNzKCksCi0JCQkJCSBlcnJtc2coImNvdWxkIG5vdCByZWFkIGZyb20gc3RyZWFtaW5nIHRy YW5zYWN0aW9uJ3MgY2hhbmdlcyBmaWxlIFwiJXNcIjogJW0iLAotCQkJCQkJCXBhdGgpKSk7 CisJCUJ1ZkZpbGVSZWFkRXhhY3QoZmQsIGJ1ZmZlciwgbGVuKTsKIAogCQkvKiBjb3B5IHRo ZSBidWZmZXIgdG8gdGhlIHN0cmluZ2luZm8gYW5kIGNhbGwgYXBwbHlfZGlzcGF0Y2ggKi8K IAkJcmVzZXRTdHJpbmdJbmZvKCZzMik7CkBAIC0zMjQ1LDEzICszMjM1LDcgQEAgc3VieGFj dF9pbmZvX3JlYWQoT2lkIHN1YmlkLCBUcmFuc2FjdGlvbklkIHhpZCkKIAkJcmV0dXJuOwog CiAJLyogcmVhZCBudW1iZXIgb2Ygc3VieGFjdCBpdGVtcyAqLwotCWlmIChCdWZGaWxlUmVh ZChmZCwgJnN1YnhhY3RfZGF0YS5uc3VieGFjdHMsCi0JCQkJCXNpemVvZihzdWJ4YWN0X2Rh dGEubnN1YnhhY3RzKSkgIT0KLQkJc2l6ZW9mKHN1YnhhY3RfZGF0YS5uc3VieGFjdHMpKQot CQllcmVwb3J0KEVSUk9SLAotCQkJCShlcnJjb2RlX2Zvcl9maWxlX2FjY2VzcygpLAotCQkJ CSBlcnJtc2coImNvdWxkIG5vdCByZWFkIGZyb20gc3RyZWFtaW5nIHRyYW5zYWN0aW9uJ3Mg c3VieGFjdCBmaWxlIFwiJXNcIjogJW0iLAotCQkJCQkJcGF0aCkpKTsKKwlCdWZGaWxlUmVh ZEV4YWN0KGZkLCAmc3VieGFjdF9kYXRhLm5zdWJ4YWN0cywgc2l6ZW9mKHN1YnhhY3RfZGF0 YS5uc3VieGFjdHMpKTsKIAogCWxlbiA9IHNpemVvZihTdWJYYWN0SW5mbykgKiBzdWJ4YWN0 X2RhdGEubnN1YnhhY3RzOwogCkBAIC0zMjY5LDExICszMjUzLDggQEAgc3VieGFjdF9pbmZv X3JlYWQoT2lkIHN1YmlkLCBUcmFuc2FjdGlvbklkIHhpZCkKIAkJCQkJCQkJICAgc2l6ZW9m KFN1YlhhY3RJbmZvKSk7CiAJTWVtb3J5Q29udGV4dFN3aXRjaFRvKG9sZGN0eCk7CiAKLQlp ZiAoKGxlbiA+IDApICYmICgoQnVmRmlsZVJlYWQoZmQsIHN1YnhhY3RfZGF0YS5zdWJ4YWN0 cywgbGVuKSkgIT0gbGVuKSkKLQkJZXJlcG9ydChFUlJPUiwKLQkJCQkoZXJyY29kZV9mb3Jf ZmlsZV9hY2Nlc3MoKSwKLQkJCQkgZXJybXNnKCJjb3VsZCBub3QgcmVhZCBmcm9tIHN0cmVh bWluZyB0cmFuc2FjdGlvbidzIHN1YnhhY3QgZmlsZSBcIiVzXCI6ICVtIiwKLQkJCQkJCXBh dGgpKSk7CisJaWYgKGxlbiA+IDApCisJCUJ1ZkZpbGVSZWFkRXhhY3QoZmQsIHN1YnhhY3Rf ZGF0YS5zdWJ4YWN0cywgbGVuKTsKIAogCUJ1ZkZpbGVDbG9zZShmZCk7CiB9CmRpZmYgLS1n aXQgYS9zcmMvYmFja2VuZC9zdG9yYWdlL2ZpbGUvYnVmZmlsZS5jIGIvc3JjL2JhY2tlbmQv c3RvcmFnZS9maWxlL2J1ZmZpbGUuYwppbmRleCBiMGI0ZWViM2JkLi42MWE0N2JjZDczIDEw MDY0NAotLS0gYS9zcmMvYmFja2VuZC9zdG9yYWdlL2ZpbGUvYnVmZmlsZS5jCisrKyBiL3Ny Yy9iYWNrZW5kL3N0b3JhZ2UvZmlsZS9idWZmaWxlLmMKQEAgLTU3MywxNCArNTczLDE5IEBA IEJ1ZkZpbGVEdW1wQnVmZmVyKEJ1ZkZpbGUgKmZpbGUpCiB9CiAKIC8qCi0gKiBCdWZGaWxl UmVhZAorICogQnVmRmlsZVJlYWQgdmFyaWFudHMKICAqCiAgKiBMaWtlIGZyZWFkKCkgZXhj ZXB0IHdlIGFzc3VtZSAxLWJ5dGUgZWxlbWVudCBzaXplIGFuZCByZXBvcnQgSS9PIGVycm9y cyB2aWEKICAqIGVyZXBvcnQoKS4KKyAqCisgKiBJZiAnZXhhY3QnIGlzIHRydWUsIHRoZW4g YW4gZXJyb3IgaXMgYWxzbyByYWlzZWQgaWYgdGhlIG51bWJlciBvZiBieXRlcworICogcmVh ZCBpcyBub3QgZXhhY3RseSAnc2l6ZScgKG5vIHNob3J0IHJlYWRzKS4gIElmICdleGFjdCcg YW5kICdlb2ZPSycgYXJlCisgKiB0cnVlLCB0aGVuIHJlYWRpbmcgemVybyBieXRlcyBpcyBv ay4KICAqLwotc2l6ZV90Ci1CdWZGaWxlUmVhZChCdWZGaWxlICpmaWxlLCB2b2lkICpwdHIs IHNpemVfdCBzaXplKQorc3RhdGljIHNpemVfdAorQnVmRmlsZVJlYWRDb21tb24oQnVmRmls ZSAqZmlsZSwgdm9pZCAqcHRyLCBzaXplX3Qgc2l6ZSwgYm9vbCBleGFjdCwgYm9vbCBlb2ZP SykKIHsKKwlzaXplX3QJCXN0YXJ0X3NpemUgPSBzaXplOwogCXNpemVfdAkJbnJlYWQgPSAw OwogCXNpemVfdAkJbnRoaXN0aW1lOwogCkBAIC02MTIsOSArNjE3LDQ1IEBAIEJ1ZkZpbGVS ZWFkKEJ1ZkZpbGUgKmZpbGUsIHZvaWQgKnB0ciwgc2l6ZV90IHNpemUpCiAJCW5yZWFkICs9 IG50aGlzdGltZTsKIAl9CiAKKwlpZiAoZXhhY3QgJiYKKwkJKG5yZWFkICE9IHN0YXJ0X3Np emUgJiYgIShucmVhZCA9PSAwICYmIGVvZk9LKSkpCisJCWVyZXBvcnQoRVJST1IsCisJCQkJ ZXJyY29kZV9mb3JfZmlsZV9hY2Nlc3MoKSwKKwkJCQllcnJtc2coImNvdWxkIG5vdCByZWFk IGZyb20gdGVtcG9yYXJ5IGZpbGU6IHJlYWQgb25seSAlenUgb2YgJXp1IGJ5dGVzIiwKKwkJ CQkJICAgbnJlYWQsIHN0YXJ0X3NpemUpKTsKKwogCXJldHVybiBucmVhZDsKIH0KIAorLyoK KyAqIExlZ2FjeSBpbnRlcmZhY2Ugd2hlcmUgdGhlIGNhbGxlciBuZWVkcyB0byBjaGVjayBm b3IgZW5kIG9mIGZpbGUgb3Igc2hvcnQKKyAqIHJlYWRzLgorICovCitzaXplX3QKK0J1ZkZp bGVSZWFkKEJ1ZkZpbGUgKmZpbGUsIHZvaWQgKnB0ciwgc2l6ZV90IHNpemUpCit7CisJcmV0 dXJuIEJ1ZkZpbGVSZWFkQ29tbW9uKGZpbGUsIHB0ciwgc2l6ZSwgZmFsc2UsIGZhbHNlKTsK K30KKworLyoKKyAqIFJlcXVpcmUgcmVhZCBvZiBleGFjdGx5IHRoZSBzcGVjaWZpZWQgc2l6 ZS4KKyAqLwordm9pZAorQnVmRmlsZVJlYWRFeGFjdChCdWZGaWxlICpmaWxlLCB2b2lkICpw dHIsIHNpemVfdCBzaXplKQoreworCUJ1ZkZpbGVSZWFkQ29tbW9uKGZpbGUsIHB0ciwgc2l6 ZSwgdHJ1ZSwgZmFsc2UpOworfQorCisvKgorICogUmVxdWlyZSByZWFkIG9mIGV4YWN0bHkg dGhlIHNwZWNpZmllZCBzaXplLCBidXQgb3B0aW9uYWxseSBhbGxvdyBlbmQgb2YKKyAqIGZp bGUgKGluIHdoaWNoIGNhc2UgMCBpcyByZXR1cm5lZCkuCisgKi8KK3NpemVfdAorQnVmRmls ZVJlYWRNYXliZUVPRihCdWZGaWxlICpmaWxlLCB2b2lkICpwdHIsIHNpemVfdCBzaXplLCBi b29sIGVvZk9LKQoreworCXJldHVybiBCdWZGaWxlUmVhZENvbW1vbihmaWxlLCBwdHIsIHNp emUsIHRydWUsIGVvZk9LKTsKK30KKwogLyoKICAqIEJ1ZkZpbGVXcml0ZQogICoKZGlmZiAt LWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxzL3NvcnQvbG9ndGFwZS5jIGIvc3JjL2JhY2tlbmQv dXRpbHMvc29ydC9sb2d0YXBlLmMKaW5kZXggYzM4NGY5OGUxMy4uNDg0NDViYzk3YyAxMDA2 NDQKLS0tIGEvc3JjL2JhY2tlbmQvdXRpbHMvc29ydC9sb2d0YXBlLmMKKysrIGIvc3JjL2Jh Y2tlbmQvdXRpbHMvc29ydC9sb2d0YXBlLmMKQEAgLTI4MSwxOSArMjgxLDEyIEBAIGx0c1dy aXRlQmxvY2soTG9naWNhbFRhcGVTZXQgKmx0cywgbG9uZyBibG9ja251bSwgdm9pZCAqYnVm ZmVyKQogc3RhdGljIHZvaWQKIGx0c1JlYWRCbG9jayhMb2dpY2FsVGFwZVNldCAqbHRzLCBs b25nIGJsb2NrbnVtLCB2b2lkICpidWZmZXIpCiB7Ci0Jc2l6ZV90CQlucmVhZDsKLQogCWlm IChCdWZGaWxlU2Vla0Jsb2NrKGx0cy0+cGZpbGUsIGJsb2NrbnVtKSAhPSAwKQogCQllcmVw b3J0KEVSUk9SLAogCQkJCShlcnJjb2RlX2Zvcl9maWxlX2FjY2VzcygpLAogCQkJCSBlcnJt c2coImNvdWxkIG5vdCBzZWVrIHRvIGJsb2NrICVsZCBvZiB0ZW1wb3JhcnkgZmlsZSIsCiAJ CQkJCQlibG9ja251bSkpKTsKLQlucmVhZCA9IEJ1ZkZpbGVSZWFkKGx0cy0+cGZpbGUsIGJ1 ZmZlciwgQkxDS1NaKTsKLQlpZiAobnJlYWQgIT0gQkxDS1NaKQotCQllcmVwb3J0KEVSUk9S LAotCQkJCShlcnJjb2RlX2Zvcl9maWxlX2FjY2VzcygpLAotCQkJCSBlcnJtc2coImNvdWxk IG5vdCByZWFkIGJsb2NrICVsZCBvZiB0ZW1wb3JhcnkgZmlsZTogcmVhZCBvbmx5ICV6dSBv ZiAlenUgYnl0ZXMiLAotCQkJCQkJYmxvY2tudW0sIG5yZWFkLCAoc2l6ZV90KSBCTENLU1op KSk7CisJQnVmRmlsZVJlYWRFeGFjdChsdHMtPnBmaWxlLCBidWZmZXIsIEJMQ0tTWik7CiB9 CiAKIC8qCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9zb3J0L3NoYXJlZHR1cGxl c3RvcmUuYyBiL3NyYy9iYWNrZW5kL3V0aWxzL3NvcnQvc2hhcmVkdHVwbGVzdG9yZS5jCmlu ZGV4IDk5NmNlZjA3ZDQuLjQ1MTUyMDYxZGQgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0 aWxzL3NvcnQvc2hhcmVkdHVwbGVzdG9yZS5jCisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL3Nv cnQvc2hhcmVkdHVwbGVzdG9yZS5jCkBAIC00MjIsMjMgKzQyMiwxMCBAQCBzdHNfcmVhZF90 dXBsZShTaGFyZWRUdXBsZXN0b3JlQWNjZXNzb3IgKmFjY2Vzc29yLCB2b2lkICptZXRhX2Rh dGEpCiAJICovCiAJaWYgKGFjY2Vzc29yLT5zdHMtPm1ldGFfZGF0YV9zaXplID4gMCkKIAl7 Ci0JCWlmIChCdWZGaWxlUmVhZChhY2Nlc3Nvci0+cmVhZF9maWxlLAotCQkJCQkJbWV0YV9k YXRhLAotCQkJCQkJYWNjZXNzb3ItPnN0cy0+bWV0YV9kYXRhX3NpemUpICE9Ci0JCQlhY2Nl c3Nvci0+c3RzLT5tZXRhX2RhdGFfc2l6ZSkKLQkJCWVyZXBvcnQoRVJST1IsCi0JCQkJCShl cnJjb2RlX2Zvcl9maWxlX2FjY2VzcygpLAotCQkJCQkgZXJybXNnKCJjb3VsZCBub3QgcmVh ZCBmcm9tIHNoYXJlZCB0dXBsZXN0b3JlIHRlbXBvcmFyeSBmaWxlIiksCi0JCQkJCSBlcnJk ZXRhaWxfaW50ZXJuYWwoIlNob3J0IHJlYWQgd2hpbGUgcmVhZGluZyBtZXRhLWRhdGEuIikp KTsKKwkJQnVmRmlsZVJlYWRFeGFjdChhY2Nlc3Nvci0+cmVhZF9maWxlLCBtZXRhX2RhdGEs IGFjY2Vzc29yLT5zdHMtPm1ldGFfZGF0YV9zaXplKTsKIAkJYWNjZXNzb3ItPnJlYWRfYnl0 ZXMgKz0gYWNjZXNzb3ItPnN0cy0+bWV0YV9kYXRhX3NpemU7CiAJfQotCWlmIChCdWZGaWxl UmVhZChhY2Nlc3Nvci0+cmVhZF9maWxlLAotCQkJCQkmc2l6ZSwKLQkJCQkJc2l6ZW9mKHNp emUpKSAhPSBzaXplb2Yoc2l6ZSkpCi0JCWVyZXBvcnQoRVJST1IsCi0JCQkJKGVycmNvZGVf Zm9yX2ZpbGVfYWNjZXNzKCksCi0JCQkJIGVycm1zZygiY291bGQgbm90IHJlYWQgZnJvbSBz aGFyZWQgdHVwbGVzdG9yZSB0ZW1wb3JhcnkgZmlsZSIpLAotCQkJCSBlcnJkZXRhaWxfaW50 ZXJuYWwoIlNob3J0IHJlYWQgd2hpbGUgcmVhZGluZyBzaXplLiIpKSk7CisJQnVmRmlsZVJl YWRFeGFjdChhY2Nlc3Nvci0+cmVhZF9maWxlLCAmc2l6ZSwgc2l6ZW9mKHNpemUpKTsKIAlh Y2Nlc3Nvci0+cmVhZF9ieXRlcyArPSBzaXplb2Yoc2l6ZSk7CiAJaWYgKHNpemUgPiBhY2Nl c3Nvci0+cmVhZF9idWZmZXJfc2l6ZSkKIAl7CkBAIC00NTUsMTMgKzQ0Miw3IEBAIHN0c19y ZWFkX3R1cGxlKFNoYXJlZFR1cGxlc3RvcmVBY2Nlc3NvciAqYWNjZXNzb3IsIHZvaWQgKm1l dGFfZGF0YSkKIAl0aGlzX2NodW5rX3NpemUgPSBNaW4ocmVtYWluaW5nX3NpemUsCiAJCQkJ CQkgIEJMQ0tTWiAqIFNUU19DSFVOS19QQUdFUyAtIGFjY2Vzc29yLT5yZWFkX2J5dGVzKTsK IAlkZXN0aW5hdGlvbiA9IGFjY2Vzc29yLT5yZWFkX2J1ZmZlciArIHNpemVvZih1aW50MzIp OwotCWlmIChCdWZGaWxlUmVhZChhY2Nlc3Nvci0+cmVhZF9maWxlLAotCQkJCQlkZXN0aW5h dGlvbiwKLQkJCQkJdGhpc19jaHVua19zaXplKSAhPSB0aGlzX2NodW5rX3NpemUpCi0JCWVy ZXBvcnQoRVJST1IsCi0JCQkJKGVycmNvZGVfZm9yX2ZpbGVfYWNjZXNzKCksCi0JCQkJIGVy cm1zZygiY291bGQgbm90IHJlYWQgZnJvbSBzaGFyZWQgdHVwbGVzdG9yZSB0ZW1wb3Jhcnkg ZmlsZSIpLAotCQkJCSBlcnJkZXRhaWxfaW50ZXJuYWwoIlNob3J0IHJlYWQgd2hpbGUgcmVh ZGluZyB0dXBsZS4iKSkpOworCUJ1ZkZpbGVSZWFkRXhhY3QoYWNjZXNzb3ItPnJlYWRfZmls ZSwgZGVzdGluYXRpb24sIHRoaXNfY2h1bmtfc2l6ZSk7CiAJYWNjZXNzb3ItPnJlYWRfYnl0 ZXMgKz0gdGhpc19jaHVua19zaXplOwogCXJlbWFpbmluZ19zaXplIC09IHRoaXNfY2h1bmtf c2l6ZTsKIAlkZXN0aW5hdGlvbiArPSB0aGlzX2NodW5rX3NpemU7CkBAIC00NzMsMTIgKzQ1 NCw3IEBAIHN0c19yZWFkX3R1cGxlKFNoYXJlZFR1cGxlc3RvcmVBY2Nlc3NvciAqYWNjZXNz b3IsIHZvaWQgKm1ldGFfZGF0YSkKIAkJLyogV2UgYXJlIG5vdyBwb3NpdGlvbmVkIGF0IHRo ZSBzdGFydCBvZiBhbiBvdmVyZmxvdyBjaHVuay4gKi8KIAkJU2hhcmVkVHVwbGVzdG9yZUNo dW5rIGNodW5rX2hlYWRlcjsKIAotCQlpZiAoQnVmRmlsZVJlYWQoYWNjZXNzb3ItPnJlYWRf ZmlsZSwgJmNodW5rX2hlYWRlciwgU1RTX0NIVU5LX0hFQURFUl9TSVpFKSAhPQotCQkJU1RT X0NIVU5LX0hFQURFUl9TSVpFKQotCQkJZXJlcG9ydChFUlJPUiwKLQkJCQkJKGVycmNvZGVf Zm9yX2ZpbGVfYWNjZXNzKCksCi0JCQkJCSBlcnJtc2coImNvdWxkIG5vdCByZWFkIGZyb20g c2hhcmVkIHR1cGxlc3RvcmUgdGVtcG9yYXJ5IGZpbGUiKSwKLQkJCQkJIGVycmRldGFpbF9p bnRlcm5hbCgiU2hvcnQgcmVhZCB3aGlsZSByZWFkaW5nIG92ZXJmbG93IGNodW5rIGhlYWRl ci4iKSkpOworCQlCdWZGaWxlUmVhZEV4YWN0KGFjY2Vzc29yLT5yZWFkX2ZpbGUsICZjaHVu a19oZWFkZXIsIFNUU19DSFVOS19IRUFERVJfU0laRSk7CiAJCWFjY2Vzc29yLT5yZWFkX2J5 dGVzID0gU1RTX0NIVU5LX0hFQURFUl9TSVpFOwogCQlpZiAoY2h1bmtfaGVhZGVyLm92ZXJm bG93ID09IDApCiAJCQllcmVwb3J0KEVSUk9SLApAQCAtNDg5LDEzICs0NjUsNyBAQCBzdHNf cmVhZF90dXBsZShTaGFyZWRUdXBsZXN0b3JlQWNjZXNzb3IgKmFjY2Vzc29yLCB2b2lkICpt ZXRhX2RhdGEpCiAJCXRoaXNfY2h1bmtfc2l6ZSA9IE1pbihyZW1haW5pbmdfc2l6ZSwKIAkJ CQkJCQkgIEJMQ0tTWiAqIFNUU19DSFVOS19QQUdFUyAtCiAJCQkJCQkJICBTVFNfQ0hVTktf SEVBREVSX1NJWkUpOwotCQlpZiAoQnVmRmlsZVJlYWQoYWNjZXNzb3ItPnJlYWRfZmlsZSwK LQkJCQkJCWRlc3RpbmF0aW9uLAotCQkJCQkJdGhpc19jaHVua19zaXplKSAhPSB0aGlzX2No dW5rX3NpemUpCi0JCQllcmVwb3J0KEVSUk9SLAotCQkJCQkoZXJyY29kZV9mb3JfZmlsZV9h Y2Nlc3MoKSwKLQkJCQkJIGVycm1zZygiY291bGQgbm90IHJlYWQgZnJvbSBzaGFyZWQgdHVw bGVzdG9yZSB0ZW1wb3JhcnkgZmlsZSIpLAotCQkJCQkgZXJyZGV0YWlsX2ludGVybmFsKCJT aG9ydCByZWFkIHdoaWxlIHJlYWRpbmcgdHVwbGUuIikpKTsKKwkJQnVmRmlsZVJlYWRFeGFj dChhY2Nlc3Nvci0+cmVhZF9maWxlLCBkZXN0aW5hdGlvbiwgdGhpc19jaHVua19zaXplKTsK IAkJYWNjZXNzb3ItPnJlYWRfYnl0ZXMgKz0gdGhpc19jaHVua19zaXplOwogCQlyZW1haW5p bmdfc2l6ZSAtPSB0aGlzX2NodW5rX3NpemU7CiAJCWRlc3RpbmF0aW9uICs9IHRoaXNfY2h1 bmtfc2l6ZTsKQEAgLTU1MSw3ICs1MjEsNiBAQCBzdHNfcGFyYWxsZWxfc2Nhbl9uZXh0KFNo YXJlZFR1cGxlc3RvcmVBY2Nlc3NvciAqYWNjZXNzb3IsIHZvaWQgKm1ldGFfZGF0YSkKIAkJ aWYgKCFlb2YpCiAJCXsKIAkJCVNoYXJlZFR1cGxlc3RvcmVDaHVuayBjaHVua19oZWFkZXI7 Ci0JCQlzaXplX3QJCW5yZWFkOwogCiAJCQkvKiBNYWtlIHN1cmUgd2UgaGF2ZSB0aGUgZmls ZSBvcGVuLiAqLwogCQkJaWYgKGFjY2Vzc29yLT5yZWFkX2ZpbGUgPT0gTlVMTCkKQEAgLTU3 MCwxMyArNTM5LDcgQEAgc3RzX3BhcmFsbGVsX3NjYW5fbmV4dChTaGFyZWRUdXBsZXN0b3Jl QWNjZXNzb3IgKmFjY2Vzc29yLCB2b2lkICptZXRhX2RhdGEpCiAJCQkJCQkoZXJyY29kZV9m b3JfZmlsZV9hY2Nlc3MoKSwKIAkJCQkJCSBlcnJtc2coImNvdWxkIG5vdCBzZWVrIHRvIGJs b2NrICV1IGluIHNoYXJlZCB0dXBsZXN0b3JlIHRlbXBvcmFyeSBmaWxlIiwKIAkJCQkJCQkJ cmVhZF9wYWdlKSkpOwotCQkJbnJlYWQgPSBCdWZGaWxlUmVhZChhY2Nlc3Nvci0+cmVhZF9m aWxlLCAmY2h1bmtfaGVhZGVyLAotCQkJCQkJCQlTVFNfQ0hVTktfSEVBREVSX1NJWkUpOwot CQkJaWYgKG5yZWFkICE9IFNUU19DSFVOS19IRUFERVJfU0laRSkKLQkJCQllcmVwb3J0KEVS Uk9SLAotCQkJCQkJKGVycmNvZGVfZm9yX2ZpbGVfYWNjZXNzKCksCi0JCQkJCQkgZXJybXNn KCJjb3VsZCBub3QgcmVhZCBmcm9tIHNoYXJlZCB0dXBsZXN0b3JlIHRlbXBvcmFyeSBmaWxl OiByZWFkIG9ubHkgJXp1IG9mICV6dSBieXRlcyIsCi0JCQkJCQkJCW5yZWFkLCBTVFNfQ0hV TktfSEVBREVSX1NJWkUpKSk7CisJCQlCdWZGaWxlUmVhZEV4YWN0KGFjY2Vzc29yLT5yZWFk X2ZpbGUsICZjaHVua19oZWFkZXIsIFNUU19DSFVOS19IRUFERVJfU0laRSk7CiAKIAkJCS8q CiAJCQkgKiBJZiB0aGlzIGlzIGFuIG92ZXJmbG93IGNodW5rLCB3ZSBza2lwIGl0IGFuZCBh bnkgZm9sbG93aW5nCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9zb3J0L3R1cGxl c3RvcmUuYyBiL3NyYy9iYWNrZW5kL3V0aWxzL3NvcnQvdHVwbGVzdG9yZS5jCmluZGV4IGNj ODg0YWIxMTYuLjZiNGU3ZTQwNTEgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL3Nv cnQvdHVwbGVzdG9yZS5jCisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL3NvcnQvdHVwbGVzdG9y ZS5jCkBAIC0xNDY4LDE1ICsxNDY4LDExIEBAIGdldGxlbihUdXBsZXN0b3Jlc3RhdGUgKnN0 YXRlLCBib29sIGVvZk9LKQogCXVuc2lnbmVkIGludCBsZW47CiAJc2l6ZV90CQluYnl0ZXM7 CiAKLQluYnl0ZXMgPSBCdWZGaWxlUmVhZChzdGF0ZS0+bXlmaWxlLCAmbGVuLCBzaXplb2Yo bGVuKSk7Ci0JaWYgKG5ieXRlcyA9PSBzaXplb2YobGVuKSkKKwluYnl0ZXMgPSBCdWZGaWxl UmVhZE1heWJlRU9GKHN0YXRlLT5teWZpbGUsICZsZW4sIHNpemVvZihsZW4pLCBlb2ZPSyk7 CisJaWYgKG5ieXRlcyA9PSAwKQorCQlyZXR1cm4gMDsKKwllbHNlCiAJCXJldHVybiBsZW47 Ci0JaWYgKG5ieXRlcyAhPSAwIHx8ICFlb2ZPSykKLQkJZXJlcG9ydChFUlJPUiwKLQkJCQko ZXJyY29kZV9mb3JfZmlsZV9hY2Nlc3MoKSwKLQkJCQkgZXJybXNnKCJjb3VsZCBub3QgcmVh ZCBmcm9tIHR1cGxlc3RvcmUgdGVtcG9yYXJ5IGZpbGU6IHJlYWQgb25seSAlenUgb2YgJXp1 IGJ5dGVzIiwKLQkJCQkJCW5ieXRlcywgc2l6ZW9mKGxlbikpKSk7Ci0JcmV0dXJuIDA7CiB9 CiAKIApAQCAtMTUyOCwyNSArMTUyNCwxMiBAQCByZWFkdHVwX2hlYXAoVHVwbGVzdG9yZXN0 YXRlICpzdGF0ZSwgdW5zaWduZWQgaW50IGxlbikKIAl1bnNpZ25lZCBpbnQgdHVwbGVuID0g dHVwYm9keWxlbiArIE1JTklNQUxfVFVQTEVfREFUQV9PRkZTRVQ7CiAJTWluaW1hbFR1cGxl IHR1cGxlID0gKE1pbmltYWxUdXBsZSkgcGFsbG9jKHR1cGxlbik7CiAJY2hhcgkgICAqdHVw Ym9keSA9IChjaGFyICopIHR1cGxlICsgTUlOSU1BTF9UVVBMRV9EQVRBX09GRlNFVDsKLQlz aXplX3QJCW5yZWFkOwogCiAJVVNFTUVNKHN0YXRlLCBHZXRNZW1vcnlDaHVua1NwYWNlKHR1 cGxlKSk7CiAJLyogcmVhZCBpbiB0aGUgdHVwbGUgcHJvcGVyICovCiAJdHVwbGUtPnRfbGVu ID0gdHVwbGVuOwotCW5yZWFkID0gQnVmRmlsZVJlYWQoc3RhdGUtPm15ZmlsZSwgdHVwYm9k eSwgdHVwYm9keWxlbik7Ci0JaWYgKG5yZWFkICE9IChzaXplX3QpIHR1cGJvZHlsZW4pCi0J CWVyZXBvcnQoRVJST1IsCi0JCQkJKGVycmNvZGVfZm9yX2ZpbGVfYWNjZXNzKCksCi0JCQkJ IGVycm1zZygiY291bGQgbm90IHJlYWQgZnJvbSB0dXBsZXN0b3JlIHRlbXBvcmFyeSBmaWxl OiByZWFkIG9ubHkgJXp1IG9mICV6dSBieXRlcyIsCi0JCQkJCQlucmVhZCwgKHNpemVfdCkg dHVwYm9keWxlbikpKTsKKwlCdWZGaWxlUmVhZEV4YWN0KHN0YXRlLT5teWZpbGUsIHR1cGJv ZHksIHR1cGJvZHlsZW4pOwogCWlmIChzdGF0ZS0+YmFja3dhcmQpCQkvKiBuZWVkIHRyYWls aW5nIGxlbmd0aCB3b3JkPyAqLwotCXsKLQkJbnJlYWQgPSBCdWZGaWxlUmVhZChzdGF0ZS0+ bXlmaWxlLCAmdHVwbGVuLCBzaXplb2YodHVwbGVuKSk7Ci0JCWlmIChucmVhZCAhPSBzaXpl b2YodHVwbGVuKSkKLQkJCWVyZXBvcnQoRVJST1IsCi0JCQkJCShlcnJjb2RlX2Zvcl9maWxl X2FjY2VzcygpLAotCQkJCQkgZXJybXNnKCJjb3VsZCBub3QgcmVhZCBmcm9tIHR1cGxlc3Rv cmUgdGVtcG9yYXJ5IGZpbGU6IHJlYWQgb25seSAlenUgb2YgJXp1IGJ5dGVzIiwKLQkJCQkJ CQlucmVhZCwgc2l6ZW9mKHR1cGxlbikpKSk7Ci0JfQorCQlCdWZGaWxlUmVhZEV4YWN0KHN0 YXRlLT5teWZpbGUsICZ0dXBsZW4sIHNpemVvZih0dXBsZW4pKTsKIAlyZXR1cm4gKHZvaWQg KikgdHVwbGU7CiB9CmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9zdG9yYWdlL2J1ZmZpbGUu aCBiL3NyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmZmlsZS5oCmluZGV4IGE0OTIyZDE4NTMuLjRi OGQ1M2E1OWUgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmZmlsZS5oCisr KyBiL3NyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmZmlsZS5oCkBAIC0zOCw3ICszOCw5IEBAIHR5 cGVkZWYgc3RydWN0IEJ1ZkZpbGUgQnVmRmlsZTsKIAogZXh0ZXJuIEJ1ZkZpbGUgKkJ1ZkZp bGVDcmVhdGVUZW1wKGJvb2wgaW50ZXJYYWN0KTsKIGV4dGVybiB2b2lkIEJ1ZkZpbGVDbG9z ZShCdWZGaWxlICpmaWxlKTsKLWV4dGVybiBzaXplX3QgQnVmRmlsZVJlYWQoQnVmRmlsZSAq ZmlsZSwgdm9pZCAqcHRyLCBzaXplX3Qgc2l6ZSk7CitleHRlcm4gcGdfbm9kaXNjYXJkIHNp emVfdCBCdWZGaWxlUmVhZChCdWZGaWxlICpmaWxlLCB2b2lkICpwdHIsIHNpemVfdCBzaXpl KTsKK2V4dGVybiB2b2lkIEJ1ZkZpbGVSZWFkRXhhY3QoQnVmRmlsZSAqZmlsZSwgdm9pZCAq cHRyLCBzaXplX3Qgc2l6ZSk7CitleHRlcm4gc2l6ZV90IEJ1ZkZpbGVSZWFkTWF5YmVFT0Yo QnVmRmlsZSAqZmlsZSwgdm9pZCAqcHRyLCBzaXplX3Qgc2l6ZSwgYm9vbCBlb2ZPSyk7CiBl eHRlcm4gdm9pZCBCdWZGaWxlV3JpdGUoQnVmRmlsZSAqZmlsZSwgdm9pZCAqcHRyLCBzaXpl X3Qgc2l6ZSk7CiBleHRlcm4gaW50CUJ1ZkZpbGVTZWVrKEJ1ZkZpbGUgKmZpbGUsIGludCBm aWxlbm8sIG9mZl90IG9mZnNldCwgaW50IHdoZW5jZSk7CiBleHRlcm4gdm9pZCBCdWZGaWxl VGVsbChCdWZGaWxlICpmaWxlLCBpbnQgKmZpbGVubywgb2ZmX3QgKm9mZnNldCk7CgpiYXNl LWNvbW1pdDogYWRiNWMzMmViNTNlMWZmZGM1Yzk1NGFhZmNjNWJjOWVkOTNmM2RlNgotLSAK Mi4zOS4wCgo= --------------khiV72B0dwcahqJMhgPPwsrQ--