242762 2022-07-14 12:47:13 -0700 [ANGLE] Bounds check index buffer generation 2022-07-15 16:25:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kpiddington kpiddington dino ews-watchlist kbr kondapallykalyan webkit-bug-importer oldest_to_newest 1883720 0 kpiddington 2022-07-14 12:47:13 -0700 [ANGLE] Bounds check index buffer generation 1883722 1 460902 kpiddington 2022-07-14 12:48:56 -0700 Created attachment 460902 Patch 1883723 2 kpiddington 2022-07-14 12:51:22 -0700 <rdar://95875589> 1883727 3 460903 kpiddington 2022-07-14 13:04:23 -0700 Created attachment 460903 Patch 1883728 4 ews-watchlist 2022-07-14 13:06:03 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1883915 5 460915 kpiddington 2022-07-14 16:53:58 -0700 Created attachment 460915 Patch 1883920 6 460916 kpiddington 2022-07-14 17:02:01 -0700 Created attachment 460916 Patch 1883922 7 kbr 2022-07-14 17:04:11 -0700 Dean reviewed one of these earlier patches. But - would you like to migrate to the Github workflow, and upload a pull request for this rather than patches? It's missing the COMMIT_MESSAGE file as is. 1884187 8 kpiddington 2022-07-15 13:49:13 -0700 Made a manual-ish pull request: the pr workflow wasn't quite working for me, probably due to some repository cruft. https://github.com/WebKit/WebKit/pull/2469 1884380 9 ews-feeder 2022-07-15 16:24:53 -0700 Committed 252526@main (7bf231b1fd35): <https://commits.webkit.org/252526@main> Reviewed commits have been landed. Closing PR #2469 and removing active labels. 1884381 10 webkit-bug-importer 2022-07-15 16:25:16 -0700 <rdar://problem/97100061> 460902 2022-07-14 12:48:56 -0700 2022-07-14 13:04:22 -0700 Patch bug-242762-20220714124855.patch text/plain 13321 kpiddington ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5oCmluZGV4IDZiZTk2OTBl MTU5ZjNjNTU3M2VhNzY0MTk1MjJlYWE5OWU0Y2Y0NTkuLjdiNmM4YzA1OWUyMWY5NjY4OWYzZmNi N2JmZDg2ODk5YjkxYTgxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmgKKysrIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9yZW5kZXJf dXRpbHMuaApAQCAtMTQ2LDYgKzE0Niw3IEBAIHN0cnVjdCBJbmRleEdlbmVyYXRpb25QYXJhbXMK ICAgICBCdWZmZXJSZWYgZHN0QnVmZmVyOwogICAgIHVpbnQzMl90IGRzdE9mZnNldDsKICAgICBi b29sIHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkID0gZmFsc2U7CisgICAgR0xzaXplaSBtYXhJbmRl eENvdW50ID0gc3RkOjpudW1lcmljX2xpbWl0czxHTHNpemVpPjo6bWF4KCk7CiB9OwogCiBzdHJ1 Y3QgQ29weVBpeGVsc0NvbW1vblBhcmFtcwpAQCAtMzg4LDYgKzM4OSw3IEBAIGNsYXNzIEluZGV4 R2VuZXJhdG9yVXRpbHMgZmluYWwgOiBhbmdsZTo6Tm9uQ29weWFibGUKICAgICAgICAgQ29udGV4 dE10bCAqY29udGV4dE10bCwKICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5cGUgc3JjVHlwZSwK ICAgICAgICAgdWludDMyX3QgaW5kZXhDb3VudCwKKyAgICAgICAgdWludDMyX3QgbWF4SW5kZXhD b3VudCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZzcmNCdWZmZXIsCiAgICAgICAgIHVpbnQz Ml90IHNyY09mZnNldCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvbXRsX3JlbmRlcl91dGlscy5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJB TkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCmluZGV4IDFlMmI2ODg4ZWYy MDVjMzU1YjIyMjBmYjM2ZDNiODg5YTYxNGZhMjUuLjg3YzQyMGZmZTFmN2JkNDk0YjI4MGM0NDVk YjA1NGRkOGI1ZDJiYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0 aWxzLm1tCkBAIC04Nyw4ICs4Nyw5IEBAIHN0cnVjdCBJbmRleENvbnZlcnNpb25Vbmlmb3JtCiB7 CiAgICAgdWludDMyX3Qgc3JjT2Zmc2V0OwogICAgIHVpbnQzMl90IGluZGV4Q291bnQ7CisgICAg dWludDMyX3QgbWF4SW5kZXg7CiAgICAgdWludDhfdCBwcmltaXRpdmVSZXN0YXJ0RW5hYmxlZDsK LSAgICB1aW50OF90IHBhZGRpbmdbN107CisgICAgdWludDhfdCBwYWRkaW5nWzNdOwogfTsKIAog Ly8gU2VlIGxpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvdmlzaWJpbGl0eS5tZXRhbApA QCAtMjIyLDkgKzIyMywxNSBAQCB2b2lkIEdldEJsaXRUZXhDb29yZHMoY29uc3QgTm9ybWFsaXpl ZENvb3JkcyAmbm9ybWFsaXplZENvb3JkcywKICAgICB9CiB9CiAKK3RlbXBsYXRlIDx0eXBlbmFt ZSBUPgoraW5saW5lIFQgYWNjZXNzQm91bmRlZChjb25zdCBUICogYXJyYXksIEdMc2l6ZWkgaWR4 LCBHTHNpemVpIG1heElkeCkKK3sKKyAgICByZXR1cm4gaWR4IDwgbWF4SWR4ID8gYXJyYXlbaWR4 XSA6IDA7Cit9CiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KIGFuZ2xlOjpSZXN1bHQgR2VuVHJpRmFu RnJvbUNsaWVudEVsZW1lbnRzKENvbnRleHRNdGwgKmNvbnRleHRNdGwsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTHNpemVpIGNvdW50LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xzaXplaSBtYXhJbmRleCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJpbWl0aXZlUmVzdGFydEVu YWJsZWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBU ICppbmRpY2VzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCkBAIC0yMzYsMjMgKzI0MywyMyBAQCBhbmdsZTo6UmVz dWx0IEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhDb250ZXh0TXRsICpjb250ZXh0TXRsLAog ICAgIEdMc2l6ZWkgZHN0VHJpYW5nbGUgICAgICAgICAgICAgICAgICAgPSAwOwogICAgIHVpbnQz Ml90ICpkc3RQdHIgPSByZWludGVycHJldF9jYXN0PHVpbnQzMl90ICo+KGRzdEJ1ZmZlci0+bWFw KGNvbnRleHRNdGwpICsgZHN0T2Zmc2V0KTsKICAgICBUIHRyaUZpcnN0SWR4LCBzcmNQcmV2SWR4 OwotICAgIG1lbWNweSgmdHJpRmlyc3RJZHgsIGluZGljZXMsIHNpemVvZih0cmlGaXJzdElkeCkp OwotICAgIG1lbWNweSgmc3JjUHJldklkeCwgaW5kaWNlcyArIDEsIHNpemVvZihzcmNQcmV2SWR4 KSk7Ci0KKyAgICB0cmlGaXJzdElkeCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgMCwgbWF4SW5k ZXgpOworICAgIHNyY1ByZXZJZHggPSAgYWNjZXNzQm91bmRlZChpbmRpY2VzLCAxLCBtYXhJbmRl eCk7CisgICAgCiAgICAgaWYgKHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkKQogICAgIHsKICAgICAg ICAgR0xzaXplaSB0cmlGaXJzdElkeExvYyA9IDA7CiAgICAgICAgIHdoaWxlICh0cmlGaXJzdElk eCA9PSBrU3JjUHJpbWl0aXZlUmVzdGFydEluZGV4KQogICAgICAgICB7CiAgICAgICAgICAgICAr K3RyaUZpcnN0SWR4TG9jOwotICAgICAgICAgICAgbWVtY3B5KCZ0cmlGaXJzdElkeCwgaW5kaWNl cyArIHRyaUZpcnN0SWR4TG9jLCBzaXplb2YodHJpRmlyc3RJZHgpKTsKKyAgICAgICAgICAgIHRy aUZpcnN0SWR4ID0gYWNjZXNzQm91bmRlZChpbmRpY2VzLCB0cmlGaXJzdElkeExvYywgbWF4SW5k ZXgpOwogICAgICAgICB9CiAKICAgICAgICAgZm9yIChHTHNpemVpIGkgPSB0cmlGaXJzdElkeExv YyArIDI7IGkgPCBjb3VudDsgKytpKQogICAgICAgICB7CiAgICAgICAgICAgICB1aW50MzJfdCB0 cmlJbmRpY2VzWzNdOwogICAgICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHko JnNyY0lkeCwgaW5kaWNlcyArIGksIHNpemVvZihzcmNJZHgpKTsKKyAgICAgICAgICAgIHNyY0lk eCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgaSwgbWF4SW5kZXgpOwogICAgICAgICAgICAgYm9v bCBjb21wbGV0ZVRyaWFuZ2xlID0gdHJ1ZTsKICAgICAgICAgICAgIGlmIChzcmNQcmV2SWR4ID09 IGtTcmNQcmltaXRpdmVSZXN0YXJ0SW5kZXggfHwgc3JjSWR4ID09IGtTcmNQcmltaXRpdmVSZXN0 YXJ0SW5kZXgpCiAgICAgICAgICAgICB7CkBAIC0yODUsOCArMjkyLDcgQEAgYW5nbGU6OlJlc3Vs dCBHZW5UcmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoQ29udGV4dE10bCAqY29udGV4dE10bCwKICAg ICAgICAgZm9yIChHTHNpemVpIGkgPSAyOyBpIDwgY291bnQ7ICsraSkKICAgICAgICAgewogICAg ICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHkoJnNyY0lkeCwgaW5kaWNlcyAr IGksIHNpemVvZihzcmNJZHgpKTsKLQorICAgICAgICAgICAgc3JjSWR4ID0gYWNjZXNzQm91bmRl ZChpbmRpY2VzLGksbWF4SW5kZXgpOwogICAgICAgICAgICAgdWludDMyX3QgdHJpSW5kaWNlc1sz XTsKICAgICAgICAgICAgIHRyaUluZGljZXNbMF0gPSB0cmlGaXJzdElkeDsKICAgICAgICAgICAg IHRyaUluZGljZXNbMV0gPSBzcmNQcmV2SWR4OwpAQCAtMjA4OSwxMSArMjA5NSwxNCBAQCBhbmds ZTo6UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRpbHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVs ZW1lbnRzQXJyYXkoCiAgICAgICAgIHNpemVfdCBzcmNPZmZzZXQgICAgICAgICAgICA9IHJlaW50 ZXJwcmV0X2Nhc3Q8c2l6ZV90PihwYXJhbXMuaW5kaWNlcyk7CiAgICAgICAgIEFOR0xFX0NIRUNL KGNvbnRleHRNdGwsIHNyY09mZnNldCA8PSBzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQzMl90Pjo6 bWF4KCksCiAgICAgICAgICAgICAgICAgICAgICJJbmRleCBvZmZzZXQgaXMgdG9vIGxhcmdlIiwg R0xfSU5WQUxJRF9WQUxVRSk7CisgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBsaW1pdGVk UGFyYW1zID0gcGFyYW1zOworICAgICAgICBsaW1pdGVkUGFyYW1zLm1heEluZGV4Q291bnQgPSBz dGQ6Om1pbjxHTHNpemVpPihwYXJhbXMuaW5kZXhDb3VudCwgKEdMc2l6ZWkpKGVsZW1lbnRCdWZm ZXJNdGwtPnNpemUoKSAtIHNyY09mZnNldCkgLyAoR0xzaXplaSlHZXREcmF3RWxlbWVudHNUeXBl U2l6ZShwYXJhbXMuc3JjVHlwZSkpOworICAgICAgICAgICAgICAgIAogICAgICAgICBpZiAocGFy YW1zLnByaW1pdGl2ZVJlc3RhcnRFbmFibGVkIHx8CiAgICAgICAgICAgICAoIWNvbnRleHRNdGwt PmdldERpc3BsYXkoKS0+Z2V0RmVhdHVyZXMoKS5oYXNDaGVhcFJlbmRlclBhc3MuZW5hYmxlZCAm JgogICAgICAgICAgICAgIGNvbnRleHRNdGwtPmdldFJlbmRlckNvbW1hbmRFbmNvZGVyKCkpKQog ICAgICAgICB7Ci0gICAgICAgICAgICBJbmRleEdlbmVyYXRpb25QYXJhbXMgY3B1UGF0aFBhcmFt cyA9IHBhcmFtczsKKyAgICAgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBjcHVQYXRoUGFy YW1zID0gbGltaXRlZFBhcmFtczsKICAgICAgICAgICAgIGNwdVBhdGhQYXJhbXMuaW5kaWNlcyA9 CiAgICAgICAgICAgICAgICAgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q2xpZW50U2hhZG93Q29weURh dGEoY29udGV4dE10bCkgKyBzcmNPZmZzZXQ7CiAgICAgICAgICAgICByZXR1cm4gZ2VuZXJhdGVU cmlGYW5CdWZmZXJGcm9tRWxlbWVudHNBcnJheUNQVShjb250ZXh0TXRsLCBjcHVQYXRoUGFyYW1z LApAQCAtMjEwMiw3ICsyMTExLDcgQEAgYW5nbGU6OlJlc3VsdCBJbmRleEdlbmVyYXRvclV0aWxz OjpnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVtZW50c0FycmF5KAogICAgICAgICBlbHNlCiAg ICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVt ZW50c0FycmF5R1BVKAotICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBl LCBwYXJhbXMuaW5kZXhDb3VudCwgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q3VycmVudEJ1ZmZlcigp LAorICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBlLCBwYXJhbXMuaW5k ZXhDb3VudCwgcGFyYW1zLm1heEluZGV4Q291bnQsIGVsZW1lbnRCdWZmZXJNdGwtPmdldEN1cnJl bnRCdWZmZXIoKSwKICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDx1aW50MzJfdD4oc3JjT2Zm c2V0KSwgcGFyYW1zLmRzdEJ1ZmZlciwgcGFyYW1zLmRzdE9mZnNldCk7CiAgICAgICAgIH0KICAg ICB9CkBAIC0yMTE2LDYgKzIxMjUsNyBAQCBhbmdsZTo6UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRp bHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVsZW1lbnRzQXJyYXlHUFUoCiAgICAgQ29udGV4 dE10bCAqY29udGV4dE10bCwKICAgICBnbDo6RHJhd0VsZW1lbnRzVHlwZSBzcmNUeXBlLAogICAg IHVpbnQzMl90IGluZGV4Q291bnQsCisgICAgdWludDMyX3QgbWF4SW5kZXhDb3VudCwKICAgICBj b25zdCBCdWZmZXJSZWYgJnNyY0J1ZmZlciwKICAgICB1aW50MzJfdCBzcmNPZmZzZXQsCiAgICAg Y29uc3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCkBAIC0yMTU4LDE3ICsyMTY4LDE3IEBAIGFuZ2xl OjpSZXN1bHQgSW5kZXhHZW5lcmF0b3JVdGlsczo6Z2VuZXJhdGVUcmlGYW5CdWZmZXJGcm9tRWxl bWVudHNBcnJheUNQVSgKICAgICBzd2l0Y2ggKHBhcmFtcy5zcmNUeXBlKQogICAgIHsKICAgICAg ICAgY2FzZSBnbDo6RHJhd0VsZW1lbnRzVHlwZTo6VW5zaWduZWRCeXRlOgotICAgICAgICAgICAg cmV0dXJuIEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhjb250ZXh0TXRsLCBwYXJhbXMuaW5k ZXhDb3VudCwKKyAgICAgICAgICAgIHJldHVybiBHZW5UcmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMo Y29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsIHBhcmFtcy5tYXhJbmRleENvdW50LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXMucHJpbWl0 aXZlUmVzdGFydEVuYWJsZWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QgKj4ocGFyYW1zLmluZGljZXMpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXMuZHN0 QnVmZmVyLCBwYXJhbXMuZHN0T2Zmc2V0LCBnZW5JbmRpY2VzKTsKICAgICAgICAgY2FzZSBnbDo6 RHJhd0VsZW1lbnRzVHlwZTo6VW5zaWduZWRTaG9ydDoKLSAgICAgICAgICAgIHJldHVybiBHZW5U cmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoY29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsCisg ICAgICAgICAgICByZXR1cm4gR2VuVHJpRmFuRnJvbUNsaWVudEVsZW1lbnRzKGNvbnRleHRNdGws IHBhcmFtcy5pbmRleENvdW50LCBwYXJhbXMubWF4SW5kZXhDb3VudCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyYW1zLnByaW1pdGl2ZVJlc3RhcnRF bmFibGVkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz dGF0aWNfY2FzdDxjb25zdCB1aW50MTZfdCAqPihwYXJhbXMuaW5kaWNlcyksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtcy5kc3RCdWZmZXIsIHBh cmFtcy5kc3RPZmZzZXQsIGdlbkluZGljZXMpOwogICAgICAgICBjYXNlIGdsOjpEcmF3RWxlbWVu dHNUeXBlOjpVbnNpZ25lZEludDoKLSAgICAgICAgICAgIHJldHVybiBHZW5UcmlGYW5Gcm9tQ2xp ZW50RWxlbWVudHMoY29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsCisgICAgICAgICAgICBy ZXR1cm4gR2VuVHJpRmFuRnJvbUNsaWVudEVsZW1lbnRzKGNvbnRleHRNdGwsIHBhcmFtcy5pbmRl eENvdW50LCBwYXJhbXMubWF4SW5kZXhDb3VudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGFyYW1zLnByaW1pdGl2ZVJlc3RhcnRFbmFibGVkLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxj b25zdCB1aW50MzJfdCAqPihwYXJhbXMuaW5kaWNlcyksCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtcy5kc3RCdWZmZXIsIHBhcmFtcy5kc3RPZmZz ZXQsIGdlbkluZGljZXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvZm9ybWF0X2F1dG9nZW4uaCBiL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL2Zv cm1hdF9hdXRvZ2VuLmgKaW5kZXggYWJmNmE3NDViZTMzNWNjYWFjMTUwODliODUxZjBmZTRkZmQx MzgxZC4uMmU1YWFlM2NhNjdhMTM1OTgwYmIzMTc2ZTQ0NmYyNWU3YTc3OGVhMiAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3No YWRlcnMvZm9ybWF0X2F1dG9nZW4uaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9mb3JtYXRfYXV0b2dlbi5oCkBAIC0yNDks NSArMjQ5LDUgQEAgZW51bQogCiB9CiAKLX0gIC8vIG5hbWVzcGFjZSBtdGxfc2hhZGVyCi19ICAv LyBuYW1lc3BhY2UgcngKK30KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL2dlbl9pbmRpY2VzLm1ldGFsIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRl cnMvZ2VuX2luZGljZXMubWV0YWwKaW5kZXggZWNlYTg4NWFmMzIwNjVhZDFjYjkyZjY1ODhjYWFi NWMyZThkZDg0Ny4uZTI1MTU2YTVjYTdkMTRkNzg1NWM4ZGU1N2I2MTkzODg1ZTE3YjIyYyAxMDA2 NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21l dGFsL3NoYWRlcnMvZ2VuX2luZGljZXMubWV0YWwKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvZ2VuX2luZGljZXMubWV0YWwK QEAgLTIyLDYgKzIyLDcgQEAgc3RydWN0IEluZGV4Q29udmVyc2lvblBhcmFtcwogewogICAgIHVp bnQzMl90IHNyY09mZnNldDsgIC8vIG9mZnNldCBpbiBieXRlcwogICAgIHVpbnQzMl90IGluZGV4 Q291bnQ7CisgICAgdWludDMyX3QgbWF4SW5kZXg7CiAgICAgYm9vbCBwcmltaXRpdmVSZXN0YXJ0 RW5hYmxlZDsKIH07CiAKQEAgLTE4NywxMCArMTg4LDEwIEBAIGtlcm5lbCB2b2lkIGdlblRyaUZh bkluZGljZXNGcm9tRWxlbWVudHModWludCBpZHggW1t0aHJlYWRfcG9zaXRpb25faW5fZ3JpZF1d LAogICAgIEFOR0xFX0lEWF9DT05WRVJTSU9OX0dVQVJEKGlkeCwgb3B0aW9ucyk7CiAKICAgICB1 aW50IGVsZW1JZHggPSAyICsgaWR4OwotCi0gICAgb3V0cHV0WzMgKiBpZHhdICAgICA9IGdldElu ZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIp OwotICAgIG91dHB1dFszICogaWR4ICsgMV0gPSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNl dCwgZWxlbUlkeCAtIDEsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7Ci0gICAgb3V0cHV0 WzMgKiBpZHggKyAyXSA9IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4LCBp bnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOworICAgIAorICAgIG91dHB1dFszICogaWR4XSAg ICAgPSAob3B0aW9ucy5tYXhJbmRleCA+IDApICAgICAgICAgICA/IGdldEluZGV4VTMyKG9wdGlv bnMuc3JjT2Zmc2V0LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKKyAgICBv dXRwdXRbMyAqIGlkeCArIDFdID0gKGVsZW1JZHggLSAxIDwgb3B0aW9ucy5tYXhJbmRleCkgPyBn ZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCAtIDEsIGlucHV0VTgsIGlucHV0 VTE2LCBpbnB1dFUzMikgOiAwOworICAgIG91dHB1dFszICogaWR4ICsgMl0gPSAoZWxlbUlkeCAt IDEgPCBvcHRpb25zLm1heEluZGV4KSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBl bGVtSWR4LCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKIH0KIAogLy8gR2VuZXJh dGUgbGluZSBsb29wIGluZGljZXMgZm9yIGdsRHJhd0FycmF5KCkKQEAgLTIyMSw0ICsyMjIsNCBA QCBrZXJuZWwgdm9pZCBnZW5MaW5lTG9vcEluZGljZXNGcm9tRWxlbWVudHModWludCBpZHggW1t0 aHJlYWRfcG9zaXRpb25faW5fZ3JpZF1dLAogCiAgICAgb3V0cHV0W2lkeF0gPQogICAgICAgICBn ZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgaWR4ICUgb3B0aW9ucy5pbmRleENvdW50LCBp bnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOwotfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp bGUKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9y ZW5kZXJlci9tZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4uaW5j IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3No YWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5pbmMKaW5kZXggMTRlNDc3MmI0 ZDAzYjFjYjU2YTMzNWI5N2JiYTJmMTkyYmI4YzcyOC4uOGY5ZGU0Y2M1NDkwMjJkNTE2Nzg1ZDI4 OWNjYTM4MjkwODc0YmVhOCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNf YXV0b2dlbi5pbmMKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5pbmMK QEAgLTE0LDcgKzE0LDcgQEAgc3RhdGljIGNoYXIgZ0RlZmF1bHRNZXRhbGxpYlNyY1tdID0gUiIo CiAjIDEgInRlbXBfbWFzdGVyX3NvdXJjZS5tZXRhbCIKICMgMSAiPGJ1aWx0LWluPiIgMQogIyAx ICI8YnVpbHQtaW4+IiAzCi0jIDQzMyAiPGJ1aWx0LWluPiIgMworIyAzODQgIjxidWlsdC1pbj4i IDMKICMgMSAiPGNvbW1hbmQgbGluZT4iIDEKICMgMSAiPGJ1aWx0LWluPiIgMgogIyAxICJ0ZW1w X21hc3Rlcl9zb3VyY2UubWV0YWwiIDIKQEAgLTcyNCw2ICs3MjQsNyBAQCBzdHJ1Y3QgSW5kZXhD b252ZXJzaW9uUGFyYW1zCiB7CiAgICAgdWludDMyX3Qgc3JjT2Zmc2V0OwogICAgIHVpbnQzMl90 IGluZGV4Q291bnQ7CisgICAgdWludDMyX3QgbWF4SW5kZXg7CiAgICAgYm9vbCBwcmltaXRpdmVS ZXN0YXJ0RW5hYmxlZDsKIH07CiAKQEAgLTg5MCw5ICs4OTEsOSBAQCBrZXJuZWwgdm9pZCBnZW5U cmlGYW5JbmRpY2VzRnJvbUVsZW1lbnRzKHVpbnQgaWR4IFtbdGhyZWFkX3Bvc2l0aW9uX2luX2dy aWRdXSwKIAogICAgIHVpbnQgZWxlbUlkeCA9IDIgKyBpZHg7CiAKLSAgICBvdXRwdXRbMyAqIGlk eF0gPSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgMCwgaW5wdXRVOCwgaW5wdXRVMTYs IGlucHV0VTMyKTsKLSAgICBvdXRwdXRbMyAqIGlkeCArIDFdID0gZ2V0SW5kZXhVMzIob3B0aW9u cy5zcmNPZmZzZXQsIGVsZW1JZHggLSAxLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOwot ICAgIG91dHB1dFszICogaWR4ICsgMl0gPSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwg ZWxlbUlkeCwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKTsKKyAgICBvdXRwdXRbMyAqIGlk eF0gPSAob3B0aW9ucy5tYXhJbmRleCA+IDApID8gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZz ZXQsIDAsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMikgOiAwOworICAgIG91dHB1dFszICog aWR4ICsgMV0gPSAoZWxlbUlkeCAtIDEgPCBvcHRpb25zLm1heEluZGV4KSA/IGdldEluZGV4VTMy KG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4IC0gMSwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0 VTMyKSA6IDA7CisgICAgb3V0cHV0WzMgKiBpZHggKyAyXSA9IChlbGVtSWR4IC0gMSA8IG9wdGlv bnMubWF4SW5kZXgpID8gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHgsIGlu cHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMikgOiAwOwogfQogCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL210 bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4ubWV0YWwgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9tdGxfZGVmYXVsdF9zaGFk ZXJzX3NyY19hdXRvZ2VuLm1ldGFsCmluZGV4IDEzMDBmMzc3Y2MwMmIwYWJkYjdkMGQ4M2RiMWJl MDRjZGFlNTYxN2EuLjhhYTQwNDc3ZDc5YzM2YTg3NWFlZDc4OTZlZWZmNmZlYmEyZTA5YzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9t ZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4ubWV0YWwKKysrIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRl cnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5tZXRhbApAQCAtMTEsNyArMTEsNyBA QAogIyAxICJ0ZW1wX21hc3Rlcl9zb3VyY2UubWV0YWwiCiAjIDEgIjxidWlsdC1pbj4iIDEKICMg MSAiPGJ1aWx0LWluPiIgMwotIyA0MzMgIjxidWlsdC1pbj4iIDMKKyMgMzg0ICI8YnVpbHQtaW4+ IiAzCiAjIDEgIjxjb21tYW5kIGxpbmU+IiAxCiAjIDEgIjxidWlsdC1pbj4iIDIKICMgMSAidGVt cF9tYXN0ZXJfc291cmNlLm1ldGFsIiAyCkBAIC03MjEsNiArNzIxLDcgQEAgc3RydWN0IEluZGV4 Q29udmVyc2lvblBhcmFtcwogewogICAgIHVpbnQzMl90IHNyY09mZnNldDsKICAgICB1aW50MzJf dCBpbmRleENvdW50OworICAgIHVpbnQzMl90IG1heEluZGV4OwogICAgIGJvb2wgcHJpbWl0aXZl UmVzdGFydEVuYWJsZWQ7CiB9OwogCkBAIC04ODcsOSArODg4LDkgQEAga2VybmVsIHZvaWQgZ2Vu VHJpRmFuSW5kaWNlc0Zyb21FbGVtZW50cyh1aW50IGlkeCBbW3RocmVhZF9wb3NpdGlvbl9pbl9n cmlkXV0sCiAKICAgICB1aW50IGVsZW1JZHggPSAyICsgaWR4OwogCi0gICAgb3V0cHV0WzMgKiBp ZHhdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIDAsIGlucHV0VTgsIGlucHV0VTE2 LCBpbnB1dFUzMik7Ci0gICAgb3V0cHV0WzMgKiBpZHggKyAxXSA9IGdldEluZGV4VTMyKG9wdGlv bnMuc3JjT2Zmc2V0LCBlbGVtSWR4IC0gMSwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKTsK LSAgICBvdXRwdXRbMyAqIGlkeCArIDJdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQs IGVsZW1JZHgsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7CisgICAgb3V0cHV0WzMgKiBp ZHhdID0gKG9wdGlvbnMubWF4SW5kZXggPiAwKSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zm c2V0LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKKyAgICBvdXRwdXRbMyAq IGlkeCArIDFdID0gKGVsZW1JZHggLSAxIDwgb3B0aW9ucy5tYXhJbmRleCkgPyBnZXRJbmRleFUz MihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCAtIDEsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1 dFUzMikgOiAwOworICAgIG91dHB1dFszICogaWR4ICsgMl0gPSAoZWxlbUlkeCAtIDEgPCBvcHRp b25zLm1heEluZGV4KSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4LCBp bnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKIH0KIAogCg== 460903 2022-07-14 13:04:23 -0700 2022-07-14 16:53:57 -0700 Patch bug-242762-20220714130422.patch text/plain 12857 kpiddington ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5oCmluZGV4IDZiZTk2OTBl MTU5ZjNjNTU3M2VhNzY0MTk1MjJlYWE5OWU0Y2Y0NTkuLjdiNmM4YzA1OWUyMWY5NjY4OWYzZmNi N2JmZDg2ODk5YjkxYTgxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmgKKysrIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9yZW5kZXJf dXRpbHMuaApAQCAtMTQ2LDYgKzE0Niw3IEBAIHN0cnVjdCBJbmRleEdlbmVyYXRpb25QYXJhbXMK ICAgICBCdWZmZXJSZWYgZHN0QnVmZmVyOwogICAgIHVpbnQzMl90IGRzdE9mZnNldDsKICAgICBi b29sIHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkID0gZmFsc2U7CisgICAgR0xzaXplaSBtYXhJbmRl eENvdW50ID0gc3RkOjpudW1lcmljX2xpbWl0czxHTHNpemVpPjo6bWF4KCk7CiB9OwogCiBzdHJ1 Y3QgQ29weVBpeGVsc0NvbW1vblBhcmFtcwpAQCAtMzg4LDYgKzM4OSw3IEBAIGNsYXNzIEluZGV4 R2VuZXJhdG9yVXRpbHMgZmluYWwgOiBhbmdsZTo6Tm9uQ29weWFibGUKICAgICAgICAgQ29udGV4 dE10bCAqY29udGV4dE10bCwKICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5cGUgc3JjVHlwZSwK ICAgICAgICAgdWludDMyX3QgaW5kZXhDb3VudCwKKyAgICAgICAgdWludDMyX3QgbWF4SW5kZXhD b3VudCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZzcmNCdWZmZXIsCiAgICAgICAgIHVpbnQz Ml90IHNyY09mZnNldCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvbXRsX3JlbmRlcl91dGlscy5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJB TkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCmluZGV4IDFlMmI2ODg4ZWYy MDVjMzU1YjIyMjBmYjM2ZDNiODg5YTYxNGZhMjUuLjg3YzQyMGZmZTFmN2JkNDk0YjI4MGM0NDVk YjA1NGRkOGI1ZDJiYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0 aWxzLm1tCkBAIC04Nyw4ICs4Nyw5IEBAIHN0cnVjdCBJbmRleENvbnZlcnNpb25Vbmlmb3JtCiB7 CiAgICAgdWludDMyX3Qgc3JjT2Zmc2V0OwogICAgIHVpbnQzMl90IGluZGV4Q291bnQ7CisgICAg dWludDMyX3QgbWF4SW5kZXg7CiAgICAgdWludDhfdCBwcmltaXRpdmVSZXN0YXJ0RW5hYmxlZDsK LSAgICB1aW50OF90IHBhZGRpbmdbN107CisgICAgdWludDhfdCBwYWRkaW5nWzNdOwogfTsKIAog Ly8gU2VlIGxpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvdmlzaWJpbGl0eS5tZXRhbApA QCAtMjIyLDkgKzIyMywxNSBAQCB2b2lkIEdldEJsaXRUZXhDb29yZHMoY29uc3QgTm9ybWFsaXpl ZENvb3JkcyAmbm9ybWFsaXplZENvb3JkcywKICAgICB9CiB9CiAKK3RlbXBsYXRlIDx0eXBlbmFt ZSBUPgoraW5saW5lIFQgYWNjZXNzQm91bmRlZChjb25zdCBUICogYXJyYXksIEdMc2l6ZWkgaWR4 LCBHTHNpemVpIG1heElkeCkKK3sKKyAgICByZXR1cm4gaWR4IDwgbWF4SWR4ID8gYXJyYXlbaWR4 XSA6IDA7Cit9CiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KIGFuZ2xlOjpSZXN1bHQgR2VuVHJpRmFu RnJvbUNsaWVudEVsZW1lbnRzKENvbnRleHRNdGwgKmNvbnRleHRNdGwsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTHNpemVpIGNvdW50LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xzaXplaSBtYXhJbmRleCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJpbWl0aXZlUmVzdGFydEVu YWJsZWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBU ICppbmRpY2VzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCkBAIC0yMzYsMjMgKzI0MywyMyBAQCBhbmdsZTo6UmVz dWx0IEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhDb250ZXh0TXRsICpjb250ZXh0TXRsLAog ICAgIEdMc2l6ZWkgZHN0VHJpYW5nbGUgICAgICAgICAgICAgICAgICAgPSAwOwogICAgIHVpbnQz Ml90ICpkc3RQdHIgPSByZWludGVycHJldF9jYXN0PHVpbnQzMl90ICo+KGRzdEJ1ZmZlci0+bWFw KGNvbnRleHRNdGwpICsgZHN0T2Zmc2V0KTsKICAgICBUIHRyaUZpcnN0SWR4LCBzcmNQcmV2SWR4 OwotICAgIG1lbWNweSgmdHJpRmlyc3RJZHgsIGluZGljZXMsIHNpemVvZih0cmlGaXJzdElkeCkp OwotICAgIG1lbWNweSgmc3JjUHJldklkeCwgaW5kaWNlcyArIDEsIHNpemVvZihzcmNQcmV2SWR4 KSk7Ci0KKyAgICB0cmlGaXJzdElkeCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgMCwgbWF4SW5k ZXgpOworICAgIHNyY1ByZXZJZHggPSAgYWNjZXNzQm91bmRlZChpbmRpY2VzLCAxLCBtYXhJbmRl eCk7CisgICAgCiAgICAgaWYgKHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkKQogICAgIHsKICAgICAg ICAgR0xzaXplaSB0cmlGaXJzdElkeExvYyA9IDA7CiAgICAgICAgIHdoaWxlICh0cmlGaXJzdElk eCA9PSBrU3JjUHJpbWl0aXZlUmVzdGFydEluZGV4KQogICAgICAgICB7CiAgICAgICAgICAgICAr K3RyaUZpcnN0SWR4TG9jOwotICAgICAgICAgICAgbWVtY3B5KCZ0cmlGaXJzdElkeCwgaW5kaWNl cyArIHRyaUZpcnN0SWR4TG9jLCBzaXplb2YodHJpRmlyc3RJZHgpKTsKKyAgICAgICAgICAgIHRy aUZpcnN0SWR4ID0gYWNjZXNzQm91bmRlZChpbmRpY2VzLCB0cmlGaXJzdElkeExvYywgbWF4SW5k ZXgpOwogICAgICAgICB9CiAKICAgICAgICAgZm9yIChHTHNpemVpIGkgPSB0cmlGaXJzdElkeExv YyArIDI7IGkgPCBjb3VudDsgKytpKQogICAgICAgICB7CiAgICAgICAgICAgICB1aW50MzJfdCB0 cmlJbmRpY2VzWzNdOwogICAgICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHko JnNyY0lkeCwgaW5kaWNlcyArIGksIHNpemVvZihzcmNJZHgpKTsKKyAgICAgICAgICAgIHNyY0lk eCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgaSwgbWF4SW5kZXgpOwogICAgICAgICAgICAgYm9v bCBjb21wbGV0ZVRyaWFuZ2xlID0gdHJ1ZTsKICAgICAgICAgICAgIGlmIChzcmNQcmV2SWR4ID09 IGtTcmNQcmltaXRpdmVSZXN0YXJ0SW5kZXggfHwgc3JjSWR4ID09IGtTcmNQcmltaXRpdmVSZXN0 YXJ0SW5kZXgpCiAgICAgICAgICAgICB7CkBAIC0yODUsOCArMjkyLDcgQEAgYW5nbGU6OlJlc3Vs dCBHZW5UcmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoQ29udGV4dE10bCAqY29udGV4dE10bCwKICAg ICAgICAgZm9yIChHTHNpemVpIGkgPSAyOyBpIDwgY291bnQ7ICsraSkKICAgICAgICAgewogICAg ICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHkoJnNyY0lkeCwgaW5kaWNlcyAr IGksIHNpemVvZihzcmNJZHgpKTsKLQorICAgICAgICAgICAgc3JjSWR4ID0gYWNjZXNzQm91bmRl ZChpbmRpY2VzLGksbWF4SW5kZXgpOwogICAgICAgICAgICAgdWludDMyX3QgdHJpSW5kaWNlc1sz XTsKICAgICAgICAgICAgIHRyaUluZGljZXNbMF0gPSB0cmlGaXJzdElkeDsKICAgICAgICAgICAg IHRyaUluZGljZXNbMV0gPSBzcmNQcmV2SWR4OwpAQCAtMjA4OSwxMSArMjA5NSwxNCBAQCBhbmds ZTo6UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRpbHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVs ZW1lbnRzQXJyYXkoCiAgICAgICAgIHNpemVfdCBzcmNPZmZzZXQgICAgICAgICAgICA9IHJlaW50 ZXJwcmV0X2Nhc3Q8c2l6ZV90PihwYXJhbXMuaW5kaWNlcyk7CiAgICAgICAgIEFOR0xFX0NIRUNL KGNvbnRleHRNdGwsIHNyY09mZnNldCA8PSBzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQzMl90Pjo6 bWF4KCksCiAgICAgICAgICAgICAgICAgICAgICJJbmRleCBvZmZzZXQgaXMgdG9vIGxhcmdlIiwg R0xfSU5WQUxJRF9WQUxVRSk7CisgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBsaW1pdGVk UGFyYW1zID0gcGFyYW1zOworICAgICAgICBsaW1pdGVkUGFyYW1zLm1heEluZGV4Q291bnQgPSBz dGQ6Om1pbjxHTHNpemVpPihwYXJhbXMuaW5kZXhDb3VudCwgKEdMc2l6ZWkpKGVsZW1lbnRCdWZm ZXJNdGwtPnNpemUoKSAtIHNyY09mZnNldCkgLyAoR0xzaXplaSlHZXREcmF3RWxlbWVudHNUeXBl U2l6ZShwYXJhbXMuc3JjVHlwZSkpOworICAgICAgICAgICAgICAgIAogICAgICAgICBpZiAocGFy YW1zLnByaW1pdGl2ZVJlc3RhcnRFbmFibGVkIHx8CiAgICAgICAgICAgICAoIWNvbnRleHRNdGwt PmdldERpc3BsYXkoKS0+Z2V0RmVhdHVyZXMoKS5oYXNDaGVhcFJlbmRlclBhc3MuZW5hYmxlZCAm JgogICAgICAgICAgICAgIGNvbnRleHRNdGwtPmdldFJlbmRlckNvbW1hbmRFbmNvZGVyKCkpKQog ICAgICAgICB7Ci0gICAgICAgICAgICBJbmRleEdlbmVyYXRpb25QYXJhbXMgY3B1UGF0aFBhcmFt cyA9IHBhcmFtczsKKyAgICAgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBjcHVQYXRoUGFy YW1zID0gbGltaXRlZFBhcmFtczsKICAgICAgICAgICAgIGNwdVBhdGhQYXJhbXMuaW5kaWNlcyA9 CiAgICAgICAgICAgICAgICAgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q2xpZW50U2hhZG93Q29weURh dGEoY29udGV4dE10bCkgKyBzcmNPZmZzZXQ7CiAgICAgICAgICAgICByZXR1cm4gZ2VuZXJhdGVU cmlGYW5CdWZmZXJGcm9tRWxlbWVudHNBcnJheUNQVShjb250ZXh0TXRsLCBjcHVQYXRoUGFyYW1z LApAQCAtMjEwMiw3ICsyMTExLDcgQEAgYW5nbGU6OlJlc3VsdCBJbmRleEdlbmVyYXRvclV0aWxz OjpnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVtZW50c0FycmF5KAogICAgICAgICBlbHNlCiAg ICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVt ZW50c0FycmF5R1BVKAotICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBl LCBwYXJhbXMuaW5kZXhDb3VudCwgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q3VycmVudEJ1ZmZlcigp LAorICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBlLCBwYXJhbXMuaW5k ZXhDb3VudCwgcGFyYW1zLm1heEluZGV4Q291bnQsIGVsZW1lbnRCdWZmZXJNdGwtPmdldEN1cnJl bnRCdWZmZXIoKSwKICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDx1aW50MzJfdD4oc3JjT2Zm c2V0KSwgcGFyYW1zLmRzdEJ1ZmZlciwgcGFyYW1zLmRzdE9mZnNldCk7CiAgICAgICAgIH0KICAg ICB9CkBAIC0yMTE2LDYgKzIxMjUsNyBAQCBhbmdsZTo6UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRp bHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVsZW1lbnRzQXJyYXlHUFUoCiAgICAgQ29udGV4 dE10bCAqY29udGV4dE10bCwKICAgICBnbDo6RHJhd0VsZW1lbnRzVHlwZSBzcmNUeXBlLAogICAg IHVpbnQzMl90IGluZGV4Q291bnQsCisgICAgdWludDMyX3QgbWF4SW5kZXhDb3VudCwKICAgICBj b25zdCBCdWZmZXJSZWYgJnNyY0J1ZmZlciwKICAgICB1aW50MzJfdCBzcmNPZmZzZXQsCiAgICAg Y29uc3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCkBAIC0yMTU4LDE3ICsyMTY4LDE3IEBAIGFuZ2xl OjpSZXN1bHQgSW5kZXhHZW5lcmF0b3JVdGlsczo6Z2VuZXJhdGVUcmlGYW5CdWZmZXJGcm9tRWxl bWVudHNBcnJheUNQVSgKICAgICBzd2l0Y2ggKHBhcmFtcy5zcmNUeXBlKQogICAgIHsKICAgICAg ICAgY2FzZSBnbDo6RHJhd0VsZW1lbnRzVHlwZTo6VW5zaWduZWRCeXRlOgotICAgICAgICAgICAg cmV0dXJuIEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhjb250ZXh0TXRsLCBwYXJhbXMuaW5k ZXhDb3VudCwKKyAgICAgICAgICAgIHJldHVybiBHZW5UcmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMo Y29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsIHBhcmFtcy5tYXhJbmRleENvdW50LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXMucHJpbWl0 aXZlUmVzdGFydEVuYWJsZWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QgKj4ocGFyYW1zLmluZGljZXMpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXMuZHN0 QnVmZmVyLCBwYXJhbXMuZHN0T2Zmc2V0LCBnZW5JbmRpY2VzKTsKICAgICAgICAgY2FzZSBnbDo6 RHJhd0VsZW1lbnRzVHlwZTo6VW5zaWduZWRTaG9ydDoKLSAgICAgICAgICAgIHJldHVybiBHZW5U cmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoY29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsCisg ICAgICAgICAgICByZXR1cm4gR2VuVHJpRmFuRnJvbUNsaWVudEVsZW1lbnRzKGNvbnRleHRNdGws IHBhcmFtcy5pbmRleENvdW50LCBwYXJhbXMubWF4SW5kZXhDb3VudCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyYW1zLnByaW1pdGl2ZVJlc3RhcnRF bmFibGVkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz dGF0aWNfY2FzdDxjb25zdCB1aW50MTZfdCAqPihwYXJhbXMuaW5kaWNlcyksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtcy5kc3RCdWZmZXIsIHBh cmFtcy5kc3RPZmZzZXQsIGdlbkluZGljZXMpOwogICAgICAgICBjYXNlIGdsOjpEcmF3RWxlbWVu dHNUeXBlOjpVbnNpZ25lZEludDoKLSAgICAgICAgICAgIHJldHVybiBHZW5UcmlGYW5Gcm9tQ2xp ZW50RWxlbWVudHMoY29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsCisgICAgICAgICAgICBy ZXR1cm4gR2VuVHJpRmFuRnJvbUNsaWVudEVsZW1lbnRzKGNvbnRleHRNdGwsIHBhcmFtcy5pbmRl eENvdW50LCBwYXJhbXMubWF4SW5kZXhDb3VudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGFyYW1zLnByaW1pdGl2ZVJlc3RhcnRFbmFibGVkLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxj b25zdCB1aW50MzJfdCAqPihwYXJhbXMuaW5kaWNlcyksCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtcy5kc3RCdWZmZXIsIHBhcmFtcy5kc3RPZmZz ZXQsIGdlbkluZGljZXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvZm9ybWF0X2F1dG9nZW4uaCBiL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL2Zv cm1hdF9hdXRvZ2VuLmgKaW5kZXggYWJmNmE3NDViZTMzNWNjYWFjMTUwODliODUxZjBmZTRkZmQx MzgxZC4uMmU1YWFlM2NhNjdhMTM1OTgwYmIzMTc2ZTQ0NmYyNWU3YTc3OGVhMiAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3No YWRlcnMvZm9ybWF0X2F1dG9nZW4uaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9mb3JtYXRfYXV0b2dlbi5oCkBAIC0yNDks NSArMjQ5LDUgQEAgZW51bQogCiB9CiAKLX0gIC8vIG5hbWVzcGFjZSBtdGxfc2hhZGVyCi19ICAv LyBuYW1lc3BhY2UgcngKK30KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL2dlbl9pbmRpY2VzLm1ldGFsIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRl cnMvZ2VuX2luZGljZXMubWV0YWwKaW5kZXggZWNlYTg4NWFmMzIwNjVhZDFjYjkyZjY1ODhjYWFi NWMyZThkZDg0Ny4uZTI1MTU2YTVjYTdkMTRkNzg1NWM4ZGU1N2I2MTkzODg1ZTE3YjIyYyAxMDA2 NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21l dGFsL3NoYWRlcnMvZ2VuX2luZGljZXMubWV0YWwKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvZ2VuX2luZGljZXMubWV0YWwK QEAgLTIyLDYgKzIyLDcgQEAgc3RydWN0IEluZGV4Q29udmVyc2lvblBhcmFtcwogewogICAgIHVp bnQzMl90IHNyY09mZnNldDsgIC8vIG9mZnNldCBpbiBieXRlcwogICAgIHVpbnQzMl90IGluZGV4 Q291bnQ7CisgICAgdWludDMyX3QgbWF4SW5kZXg7CiAgICAgYm9vbCBwcmltaXRpdmVSZXN0YXJ0 RW5hYmxlZDsKIH07CiAKQEAgLTE4NywxMCArMTg4LDEwIEBAIGtlcm5lbCB2b2lkIGdlblRyaUZh bkluZGljZXNGcm9tRWxlbWVudHModWludCBpZHggW1t0aHJlYWRfcG9zaXRpb25faW5fZ3JpZF1d LAogICAgIEFOR0xFX0lEWF9DT05WRVJTSU9OX0dVQVJEKGlkeCwgb3B0aW9ucyk7CiAKICAgICB1 aW50IGVsZW1JZHggPSAyICsgaWR4OwotCi0gICAgb3V0cHV0WzMgKiBpZHhdICAgICA9IGdldElu ZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIp OwotICAgIG91dHB1dFszICogaWR4ICsgMV0gPSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNl dCwgZWxlbUlkeCAtIDEsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7Ci0gICAgb3V0cHV0 WzMgKiBpZHggKyAyXSA9IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4LCBp bnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOworICAgIAorICAgIG91dHB1dFszICogaWR4XSAg ICAgPSAob3B0aW9ucy5tYXhJbmRleCA+IDApICAgICAgICAgICA/IGdldEluZGV4VTMyKG9wdGlv bnMuc3JjT2Zmc2V0LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKKyAgICBv dXRwdXRbMyAqIGlkeCArIDFdID0gKGVsZW1JZHggLSAxIDwgb3B0aW9ucy5tYXhJbmRleCkgPyBn ZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCAtIDEsIGlucHV0VTgsIGlucHV0 VTE2LCBpbnB1dFUzMikgOiAwOworICAgIG91dHB1dFszICogaWR4ICsgMl0gPSAoZWxlbUlkeCAt IDEgPCBvcHRpb25zLm1heEluZGV4KSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBl bGVtSWR4LCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKIH0KIAogLy8gR2VuZXJh dGUgbGluZSBsb29wIGluZGljZXMgZm9yIGdsRHJhd0FycmF5KCkKQEAgLTIyMSw0ICsyMjIsNCBA QCBrZXJuZWwgdm9pZCBnZW5MaW5lTG9vcEluZGljZXNGcm9tRWxlbWVudHModWludCBpZHggW1t0 aHJlYWRfcG9zaXRpb25faW5fZ3JpZF1dLAogCiAgICAgb3V0cHV0W2lkeF0gPQogICAgICAgICBn ZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgaWR4ICUgb3B0aW9ucy5pbmRleENvdW50LCBp bnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOwotfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp bGUKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9y ZW5kZXJlci9tZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4uaW5j IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3No YWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5pbmMKaW5kZXggMTRlNDc3MmI0 ZDAzYjFjYjU2YTMzNWI5N2JiYTJmMTkyYmI4YzcyOC4uMmQ3ZDYxZjI2MDQ0OWZhMGI1ZWFkNTc0 ZmJiYzBlMDQ5NDVlNmI3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNf YXV0b2dlbi5pbmMKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5pbmMK QEAgLTcyNCw2ICs3MjQsNyBAQCBzdHJ1Y3QgSW5kZXhDb252ZXJzaW9uUGFyYW1zCiB7CiAgICAg dWludDMyX3Qgc3JjT2Zmc2V0OwogICAgIHVpbnQzMl90IGluZGV4Q291bnQ7CisgICAgdWludDMy X3QgbWF4SW5kZXg7CiAgICAgYm9vbCBwcmltaXRpdmVSZXN0YXJ0RW5hYmxlZDsKIH07CiAKQEAg LTg5MCw5ICs4OTEsOSBAQCBrZXJuZWwgdm9pZCBnZW5UcmlGYW5JbmRpY2VzRnJvbUVsZW1lbnRz KHVpbnQgaWR4IFtbdGhyZWFkX3Bvc2l0aW9uX2luX2dyaWRdXSwKIAogICAgIHVpbnQgZWxlbUlk eCA9IDIgKyBpZHg7CiAKLSAgICBvdXRwdXRbMyAqIGlkeF0gPSBnZXRJbmRleFUzMihvcHRpb25z LnNyY09mZnNldCwgMCwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKTsKLSAgICBvdXRwdXRb MyAqIGlkeCArIDFdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHggLSAx LCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOwotICAgIG91dHB1dFszICogaWR4ICsgMl0g PSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCwgaW5wdXRVOCwgaW5wdXRV MTYsIGlucHV0VTMyKTsKKyAgICBvdXRwdXRbMyAqIGlkeF0gPSAob3B0aW9ucy5tYXhJbmRleCA+ IDApID8gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIDAsIGlucHV0VTgsIGlucHV0VTE2 LCBpbnB1dFUzMikgOiAwOworICAgIG91dHB1dFszICogaWR4ICsgMV0gPSAoZWxlbUlkeCAtIDEg PCBvcHRpb25zLm1heEluZGV4KSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVt SWR4IC0gMSwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKSA6IDA7CisgICAgb3V0cHV0WzMg KiBpZHggKyAyXSA9IChlbGVtSWR4IC0gMSA8IG9wdGlvbnMubWF4SW5kZXgpID8gZ2V0SW5kZXhV MzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHgsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUz MikgOiAwOwogfQogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1 dG9nZW4ubWV0YWwgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVy ZXIvbWV0YWwvc2hhZGVycy9tdGxfZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRvZ2VuLm1ldGFsCmlu ZGV4IDEzMDBmMzc3Y2MwMmIwYWJkYjdkMGQ4M2RiMWJlMDRjZGFlNTYxN2EuLmM5ZmQzODE3ZWIy MGVlNWJkMTk1NjNjYmU2ZTllNDhlOTBjMmJlZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0 X3NoYWRlcnNfc3JjX2F1dG9nZW4ubWV0YWwKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19z cmNfYXV0b2dlbi5tZXRhbApAQCAtNzIxLDYgKzcyMSw3IEBAIHN0cnVjdCBJbmRleENvbnZlcnNp b25QYXJhbXMKIHsKICAgICB1aW50MzJfdCBzcmNPZmZzZXQ7CiAgICAgdWludDMyX3QgaW5kZXhD b3VudDsKKyAgICB1aW50MzJfdCBtYXhJbmRleDsKICAgICBib29sIHByaW1pdGl2ZVJlc3RhcnRF bmFibGVkOwogfTsKIApAQCAtODg3LDkgKzg4OCw5IEBAIGtlcm5lbCB2b2lkIGdlblRyaUZhbklu ZGljZXNGcm9tRWxlbWVudHModWludCBpZHggW1t0aHJlYWRfcG9zaXRpb25faW5fZ3JpZF1dLAog CiAgICAgdWludCBlbGVtSWR4ID0gMiArIGlkeDsKIAotICAgIG91dHB1dFszICogaWR4XSA9IGdl dEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRV MzIpOwotICAgIG91dHB1dFszICogaWR4ICsgMV0gPSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09m ZnNldCwgZWxlbUlkeCAtIDEsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7Ci0gICAgb3V0 cHV0WzMgKiBpZHggKyAyXSA9IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4 LCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOworICAgIG91dHB1dFszICogaWR4XSA9IChv cHRpb25zLm1heEluZGV4ID4gMCkgPyBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgMCwg aW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKSA6IDA7CisgICAgb3V0cHV0WzMgKiBpZHggKyAx XSA9IChlbGVtSWR4IC0gMSA8IG9wdGlvbnMubWF4SW5kZXgpID8gZ2V0SW5kZXhVMzIob3B0aW9u cy5zcmNPZmZzZXQsIGVsZW1JZHggLSAxLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDog MDsKKyAgICBvdXRwdXRbMyAqIGlkeCArIDJdID0gKGVsZW1JZHggLSAxIDwgb3B0aW9ucy5tYXhJ bmRleCkgPyBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCwgaW5wdXRVOCwg aW5wdXRVMTYsIGlucHV0VTMyKSA6IDA7CiB9CiAKIAo= 460915 2022-07-14 16:53:58 -0700 2022-07-14 17:01:59 -0700 Patch bug-242762-20220714165357.patch text/plain 13296 kpiddington ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5oCmluZGV4IDZiZTk2OTBl MTU5ZjNjNTU3M2VhNzY0MTk1MjJlYWE5OWU0Y2Y0NTkuLjdiNmM4YzA1OWUyMWY5NjY4OWYzZmNi N2JmZDg2ODk5YjkxYTgxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmgKKysrIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9yZW5kZXJf dXRpbHMuaApAQCAtMTQ2LDYgKzE0Niw3IEBAIHN0cnVjdCBJbmRleEdlbmVyYXRpb25QYXJhbXMK ICAgICBCdWZmZXJSZWYgZHN0QnVmZmVyOwogICAgIHVpbnQzMl90IGRzdE9mZnNldDsKICAgICBi b29sIHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkID0gZmFsc2U7CisgICAgR0xzaXplaSBtYXhJbmRl eENvdW50ID0gc3RkOjpudW1lcmljX2xpbWl0czxHTHNpemVpPjo6bWF4KCk7CiB9OwogCiBzdHJ1 Y3QgQ29weVBpeGVsc0NvbW1vblBhcmFtcwpAQCAtMzg4LDYgKzM4OSw3IEBAIGNsYXNzIEluZGV4 R2VuZXJhdG9yVXRpbHMgZmluYWwgOiBhbmdsZTo6Tm9uQ29weWFibGUKICAgICAgICAgQ29udGV4 dE10bCAqY29udGV4dE10bCwKICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5cGUgc3JjVHlwZSwK ICAgICAgICAgdWludDMyX3QgaW5kZXhDb3VudCwKKyAgICAgICAgdWludDMyX3QgbWF4SW5kZXhD b3VudCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZzcmNCdWZmZXIsCiAgICAgICAgIHVpbnQz Ml90IHNyY09mZnNldCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvbXRsX3JlbmRlcl91dGlscy5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJB TkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCmluZGV4IDFlMmI2ODg4ZWYy MDVjMzU1YjIyMjBmYjM2ZDNiODg5YTYxNGZhMjUuLjAyMTY2ZDY4NTlhYmZjYjYxZmFlYjhiYWZl YzY3NzYyYzkwZDQxYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0 aWxzLm1tCkBAIC04Nyw4ICs4Nyw5IEBAIHN0cnVjdCBJbmRleENvbnZlcnNpb25Vbmlmb3JtCiB7 CiAgICAgdWludDMyX3Qgc3JjT2Zmc2V0OwogICAgIHVpbnQzMl90IGluZGV4Q291bnQ7CisgICAg dWludDMyX3QgbWF4SW5kZXg7CiAgICAgdWludDhfdCBwcmltaXRpdmVSZXN0YXJ0RW5hYmxlZDsK LSAgICB1aW50OF90IHBhZGRpbmdbN107CisgICAgdWludDhfdCBwYWRkaW5nWzNdOwogfTsKIAog Ly8gU2VlIGxpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvdmlzaWJpbGl0eS5tZXRhbApA QCAtMjIyLDkgKzIyMywxNSBAQCB2b2lkIEdldEJsaXRUZXhDb29yZHMoY29uc3QgTm9ybWFsaXpl ZENvb3JkcyAmbm9ybWFsaXplZENvb3JkcywKICAgICB9CiB9CiAKK3RlbXBsYXRlIDx0eXBlbmFt ZSBUPgoraW5saW5lIFQgYWNjZXNzQm91bmRlZChjb25zdCBUICogYXJyYXksIEdMc2l6ZWkgaWR4 LCBHTHNpemVpIG1heElkeCkKK3sKKyAgICByZXR1cm4gaWR4IDwgbWF4SWR4ID8gYXJyYXlbaWR4 XSA6IDA7Cit9CiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KIGFuZ2xlOjpSZXN1bHQgR2VuVHJpRmFu RnJvbUNsaWVudEVsZW1lbnRzKENvbnRleHRNdGwgKmNvbnRleHRNdGwsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTHNpemVpIGNvdW50LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xzaXplaSBtYXhJbmRleCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJpbWl0aXZlUmVzdGFydEVu YWJsZWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBU ICppbmRpY2VzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCkBAIC0yMzYsMjMgKzI0MywyMyBAQCBhbmdsZTo6UmVz dWx0IEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhDb250ZXh0TXRsICpjb250ZXh0TXRsLAog ICAgIEdMc2l6ZWkgZHN0VHJpYW5nbGUgICAgICAgICAgICAgICAgICAgPSAwOwogICAgIHVpbnQz Ml90ICpkc3RQdHIgPSByZWludGVycHJldF9jYXN0PHVpbnQzMl90ICo+KGRzdEJ1ZmZlci0+bWFw KGNvbnRleHRNdGwpICsgZHN0T2Zmc2V0KTsKICAgICBUIHRyaUZpcnN0SWR4LCBzcmNQcmV2SWR4 OwotICAgIG1lbWNweSgmdHJpRmlyc3RJZHgsIGluZGljZXMsIHNpemVvZih0cmlGaXJzdElkeCkp OwotICAgIG1lbWNweSgmc3JjUHJldklkeCwgaW5kaWNlcyArIDEsIHNpemVvZihzcmNQcmV2SWR4 KSk7Ci0KKyAgICB0cmlGaXJzdElkeCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgMCwgbWF4SW5k ZXgpOworICAgIHNyY1ByZXZJZHggPSAgYWNjZXNzQm91bmRlZChpbmRpY2VzLCAxLCBtYXhJbmRl eCk7CisgICAgCiAgICAgaWYgKHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkKQogICAgIHsKICAgICAg ICAgR0xzaXplaSB0cmlGaXJzdElkeExvYyA9IDA7CiAgICAgICAgIHdoaWxlICh0cmlGaXJzdElk eCA9PSBrU3JjUHJpbWl0aXZlUmVzdGFydEluZGV4KQogICAgICAgICB7CiAgICAgICAgICAgICAr K3RyaUZpcnN0SWR4TG9jOwotICAgICAgICAgICAgbWVtY3B5KCZ0cmlGaXJzdElkeCwgaW5kaWNl cyArIHRyaUZpcnN0SWR4TG9jLCBzaXplb2YodHJpRmlyc3RJZHgpKTsKKyAgICAgICAgICAgIHRy aUZpcnN0SWR4ID0gYWNjZXNzQm91bmRlZChpbmRpY2VzLCB0cmlGaXJzdElkeExvYywgbWF4SW5k ZXgpOwogICAgICAgICB9CiAKICAgICAgICAgZm9yIChHTHNpemVpIGkgPSB0cmlGaXJzdElkeExv YyArIDI7IGkgPCBjb3VudDsgKytpKQogICAgICAgICB7CiAgICAgICAgICAgICB1aW50MzJfdCB0 cmlJbmRpY2VzWzNdOwogICAgICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHko JnNyY0lkeCwgaW5kaWNlcyArIGksIHNpemVvZihzcmNJZHgpKTsKKyAgICAgICAgICAgIHNyY0lk eCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgaSwgbWF4SW5kZXgpOwogICAgICAgICAgICAgYm9v bCBjb21wbGV0ZVRyaWFuZ2xlID0gdHJ1ZTsKICAgICAgICAgICAgIGlmIChzcmNQcmV2SWR4ID09 IGtTcmNQcmltaXRpdmVSZXN0YXJ0SW5kZXggfHwgc3JjSWR4ID09IGtTcmNQcmltaXRpdmVSZXN0 YXJ0SW5kZXgpCiAgICAgICAgICAgICB7CkBAIC0yODUsOCArMjkyLDcgQEAgYW5nbGU6OlJlc3Vs dCBHZW5UcmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoQ29udGV4dE10bCAqY29udGV4dE10bCwKICAg ICAgICAgZm9yIChHTHNpemVpIGkgPSAyOyBpIDwgY291bnQ7ICsraSkKICAgICAgICAgewogICAg ICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHkoJnNyY0lkeCwgaW5kaWNlcyAr IGksIHNpemVvZihzcmNJZHgpKTsKLQorICAgICAgICAgICAgc3JjSWR4ID0gYWNjZXNzQm91bmRl ZChpbmRpY2VzLGksbWF4SW5kZXgpOwogICAgICAgICAgICAgdWludDMyX3QgdHJpSW5kaWNlc1sz XTsKICAgICAgICAgICAgIHRyaUluZGljZXNbMF0gPSB0cmlGaXJzdElkeDsKICAgICAgICAgICAg IHRyaUluZGljZXNbMV0gPSBzcmNQcmV2SWR4OwpAQCAtMjA4OSwxMSArMjA5NSwxNCBAQCBhbmds ZTo6UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRpbHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVs ZW1lbnRzQXJyYXkoCiAgICAgICAgIHNpemVfdCBzcmNPZmZzZXQgICAgICAgICAgICA9IHJlaW50 ZXJwcmV0X2Nhc3Q8c2l6ZV90PihwYXJhbXMuaW5kaWNlcyk7CiAgICAgICAgIEFOR0xFX0NIRUNL KGNvbnRleHRNdGwsIHNyY09mZnNldCA8PSBzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQzMl90Pjo6 bWF4KCksCiAgICAgICAgICAgICAgICAgICAgICJJbmRleCBvZmZzZXQgaXMgdG9vIGxhcmdlIiwg R0xfSU5WQUxJRF9WQUxVRSk7CisgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBsaW1pdGVk UGFyYW1zID0gcGFyYW1zOworICAgICAgICBsaW1pdGVkUGFyYW1zLm1heEluZGV4Q291bnQgPSBz dGQ6Om1pbjxHTHNpemVpPihwYXJhbXMuaW5kZXhDb3VudCwgKEdMc2l6ZWkpKGVsZW1lbnRCdWZm ZXJNdGwtPnNpemUoKSAtIHNyY09mZnNldCkgLyAoR0xzaXplaSlHZXREcmF3RWxlbWVudHNUeXBl U2l6ZShwYXJhbXMuc3JjVHlwZSkpOworICAgICAgICAgICAgICAgIAogICAgICAgICBpZiAocGFy YW1zLnByaW1pdGl2ZVJlc3RhcnRFbmFibGVkIHx8CiAgICAgICAgICAgICAoIWNvbnRleHRNdGwt PmdldERpc3BsYXkoKS0+Z2V0RmVhdHVyZXMoKS5oYXNDaGVhcFJlbmRlclBhc3MuZW5hYmxlZCAm JgogICAgICAgICAgICAgIGNvbnRleHRNdGwtPmdldFJlbmRlckNvbW1hbmRFbmNvZGVyKCkpKQog ICAgICAgICB7Ci0gICAgICAgICAgICBJbmRleEdlbmVyYXRpb25QYXJhbXMgY3B1UGF0aFBhcmFt cyA9IHBhcmFtczsKKyAgICAgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBjcHVQYXRoUGFy YW1zID0gbGltaXRlZFBhcmFtczsKICAgICAgICAgICAgIGNwdVBhdGhQYXJhbXMuaW5kaWNlcyA9 CiAgICAgICAgICAgICAgICAgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q2xpZW50U2hhZG93Q29weURh dGEoY29udGV4dE10bCkgKyBzcmNPZmZzZXQ7CiAgICAgICAgICAgICByZXR1cm4gZ2VuZXJhdGVU cmlGYW5CdWZmZXJGcm9tRWxlbWVudHNBcnJheUNQVShjb250ZXh0TXRsLCBjcHVQYXRoUGFyYW1z LApAQCAtMjEwMiw3ICsyMTExLDcgQEAgYW5nbGU6OlJlc3VsdCBJbmRleEdlbmVyYXRvclV0aWxz OjpnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVtZW50c0FycmF5KAogICAgICAgICBlbHNlCiAg ICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVt ZW50c0FycmF5R1BVKAotICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBl LCBwYXJhbXMuaW5kZXhDb3VudCwgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q3VycmVudEJ1ZmZlcigp LAorICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBlLCBwYXJhbXMuaW5k ZXhDb3VudCwgcGFyYW1zLm1heEluZGV4Q291bnQsIGVsZW1lbnRCdWZmZXJNdGwtPmdldEN1cnJl bnRCdWZmZXIoKSwKICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDx1aW50MzJfdD4oc3JjT2Zm c2V0KSwgcGFyYW1zLmRzdEJ1ZmZlciwgcGFyYW1zLmRzdE9mZnNldCk7CiAgICAgICAgIH0KICAg ICB9CkBAIC0yMTE2LDYgKzIxMjUsNyBAQCBhbmdsZTo6UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRp bHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVsZW1lbnRzQXJyYXlHUFUoCiAgICAgQ29udGV4 dE10bCAqY29udGV4dE10bCwKICAgICBnbDo6RHJhd0VsZW1lbnRzVHlwZSBzcmNUeXBlLAogICAg IHVpbnQzMl90IGluZGV4Q291bnQsCisgICAgdWludDMyX3QgbWF4SW5kZXhDb3VudCwKICAgICBj b25zdCBCdWZmZXJSZWYgJnNyY0J1ZmZlciwKICAgICB1aW50MzJfdCBzcmNPZmZzZXQsCiAgICAg Y29uc3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCkBAIC0yMTQwLDcgKzIxNTAsNyBAQCBhbmdsZTo6 UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRpbHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVsZW1l bnRzQXJyYXlHUFUoCiAgICAgSW5kZXhDb252ZXJzaW9uVW5pZm9ybSB1bmlmb3JtOwogICAgIHVu aWZvcm0uc3JjT2Zmc2V0ICA9IHNyY09mZnNldDsKICAgICB1bmlmb3JtLmluZGV4Q291bnQgPSBp bmRleENvdW50IC0gMjsgIC8vIE9ubHkgc3RhcnQgZnJvbSB0aGUgM3JkIGVsZW1lbnQuCi0KKyAg ICB1bmlmb3JtLm1heEluZGV4ICAgPSBtYXhJbmRleENvdW50OwogICAgIGNtZEVuY29kZXItPnNl dERhdGEodW5pZm9ybSwgMCk7CiAgICAgY21kRW5jb2Rlci0+c2V0QnVmZmVyKHNyY0J1ZmZlciwg MCwgMSk7CiAgICAgY21kRW5jb2Rlci0+c2V0QnVmZmVyRm9yV3JpdGUoZHN0QnVmZmVyLCBkc3RP ZmZzZXQsIDIpOwpAQCAtMjE1OCwxNyArMjE2OCwxNyBAQCBhbmdsZTo6UmVzdWx0IEluZGV4R2Vu ZXJhdG9yVXRpbHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVsZW1lbnRzQXJyYXlDUFUoCiAg ICAgc3dpdGNoIChwYXJhbXMuc3JjVHlwZSkKICAgICB7CiAgICAgICAgIGNhc2UgZ2w6OkRyYXdF bGVtZW50c1R5cGU6OlVuc2lnbmVkQnl0ZToKLSAgICAgICAgICAgIHJldHVybiBHZW5UcmlGYW5G cm9tQ2xpZW50RWxlbWVudHMoY29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsCisgICAgICAg ICAgICByZXR1cm4gR2VuVHJpRmFuRnJvbUNsaWVudEVsZW1lbnRzKGNvbnRleHRNdGwsIHBhcmFt cy5pbmRleENvdW50LCBwYXJhbXMubWF4SW5kZXhDb3VudCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyYW1zLnByaW1pdGl2ZVJlc3RhcnRFbmFibGVk LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNf Y2FzdDxjb25zdCB1aW50OF90ICo+KHBhcmFtcy5pbmRpY2VzKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyYW1zLmRzdEJ1ZmZlciwgcGFyYW1zLmRz dE9mZnNldCwgZ2VuSW5kaWNlcyk7CiAgICAgICAgIGNhc2UgZ2w6OkRyYXdFbGVtZW50c1R5cGU6 OlVuc2lnbmVkU2hvcnQ6Ci0gICAgICAgICAgICByZXR1cm4gR2VuVHJpRmFuRnJvbUNsaWVudEVs ZW1lbnRzKGNvbnRleHRNdGwsIHBhcmFtcy5pbmRleENvdW50LAorICAgICAgICAgICAgcmV0dXJu IEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhjb250ZXh0TXRsLCBwYXJhbXMuaW5kZXhDb3Vu dCwgcGFyYW1zLm1heEluZGV4Q291bnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHBhcmFtcy5wcmltaXRpdmVSZXN0YXJ0RW5hYmxlZCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3Qg dWludDE2X3QgKj4ocGFyYW1zLmluZGljZXMpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwYXJhbXMuZHN0QnVmZmVyLCBwYXJhbXMuZHN0T2Zmc2V0LCBn ZW5JbmRpY2VzKTsKICAgICAgICAgY2FzZSBnbDo6RHJhd0VsZW1lbnRzVHlwZTo6VW5zaWduZWRJ bnQ6Ci0gICAgICAgICAgICByZXR1cm4gR2VuVHJpRmFuRnJvbUNsaWVudEVsZW1lbnRzKGNvbnRl eHRNdGwsIHBhcmFtcy5pbmRleENvdW50LAorICAgICAgICAgICAgcmV0dXJuIEdlblRyaUZhbkZy b21DbGllbnRFbGVtZW50cyhjb250ZXh0TXRsLCBwYXJhbXMuaW5kZXhDb3VudCwgcGFyYW1zLm1h eEluZGV4Q291bnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBhcmFtcy5wcmltaXRpdmVSZXN0YXJ0RW5hYmxlZCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgdWludDMyX3QgKj4o cGFyYW1zLmluZGljZXMpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBwYXJhbXMuZHN0QnVmZmVyLCBwYXJhbXMuZHN0T2Zmc2V0LCBnZW5JbmRpY2VzKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9zaGFkZXJzL2Zvcm1hdF9hdXRvZ2VuLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9mb3JtYXRfYXV0b2dlbi5oCmlu ZGV4IGFiZjZhNzQ1YmUzMzVjY2FhYzE1MDg5Yjg1MWYwZmU0ZGZkMTM4MWQuLjJlNWFhZTNjYTY3 YTEzNTk4MGJiMzE3NmU0NDZmMjVlN2E3NzhlYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL2Zvcm1hdF9hdXRv Z2VuLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVy L21ldGFsL3NoYWRlcnMvZm9ybWF0X2F1dG9nZW4uaApAQCAtMjQ5LDUgKzI0OSw1IEBAIGVudW0K IAogfQogCi19ICAvLyBuYW1lc3BhY2UgbXRsX3NoYWRlcgotfSAgLy8gbmFtZXNwYWNlIHJ4Cit9 Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvc2hhZGVycy9nZW5faW5kaWNlcy5tZXRhbCBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL2dlbl9pbmRpY2VzLm1l dGFsCmluZGV4IGVjZWE4ODVhZjMyMDY1YWQxY2I5MmY2NTg4Y2FhYjVjMmU4ZGQ4NDcuLmUyNTE1 NmE1Y2E3ZDE0ZDc4NTVjOGRlNTdiNjE5Mzg4NWUxN2IyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL2dlbl9p bmRpY2VzLm1ldGFsCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9y ZW5kZXJlci9tZXRhbC9zaGFkZXJzL2dlbl9pbmRpY2VzLm1ldGFsCkBAIC0yMiw2ICsyMiw3IEBA IHN0cnVjdCBJbmRleENvbnZlcnNpb25QYXJhbXMKIHsKICAgICB1aW50MzJfdCBzcmNPZmZzZXQ7 ICAvLyBvZmZzZXQgaW4gYnl0ZXMKICAgICB1aW50MzJfdCBpbmRleENvdW50OworICAgIHVpbnQz Ml90IG1heEluZGV4OwogICAgIGJvb2wgcHJpbWl0aXZlUmVzdGFydEVuYWJsZWQ7CiB9OwogCkBA IC0xODcsMTAgKzE4OCwxMCBAQCBrZXJuZWwgdm9pZCBnZW5UcmlGYW5JbmRpY2VzRnJvbUVsZW1l bnRzKHVpbnQgaWR4IFtbdGhyZWFkX3Bvc2l0aW9uX2luX2dyaWRdXSwKICAgICBBTkdMRV9JRFhf Q09OVkVSU0lPTl9HVUFSRChpZHgsIG9wdGlvbnMpOwogCiAgICAgdWludCBlbGVtSWR4ID0gMiAr IGlkeDsKLQotICAgIG91dHB1dFszICogaWR4XSAgICAgPSBnZXRJbmRleFUzMihvcHRpb25zLnNy Y09mZnNldCwgMCwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKTsKLSAgICBvdXRwdXRbMyAq IGlkeCArIDFdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHggLSAxLCBp bnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOwotICAgIG91dHB1dFszICogaWR4ICsgMl0gPSBn ZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCwgaW5wdXRVOCwgaW5wdXRVMTYs IGlucHV0VTMyKTsKKyAgICAKKyAgICBvdXRwdXRbMyAqIGlkeF0gICAgID0gKG9wdGlvbnMubWF4 SW5kZXggPiAwKSAgICAgICAgICAgPyBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgMCwg aW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKSA6IDA7CisgICAgb3V0cHV0WzMgKiBpZHggKyAx XSA9IChlbGVtSWR4IC0gMSA8IG9wdGlvbnMubWF4SW5kZXgpID8gZ2V0SW5kZXhVMzIob3B0aW9u cy5zcmNPZmZzZXQsIGVsZW1JZHggLSAxLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDog MDsKKyAgICBvdXRwdXRbMyAqIGlkeCArIDJdID0gKGVsZW1JZHggLSAxIDwgb3B0aW9ucy5tYXhJ bmRleCkgPyBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCwgaW5wdXRVOCwg aW5wdXRVMTYsIGlucHV0VTMyKSA6IDA7CiB9CiAKIC8vIEdlbmVyYXRlIGxpbmUgbG9vcCBpbmRp Y2VzIGZvciBnbERyYXdBcnJheSgpCkBAIC0yMjEsNCArMjIyLDQgQEAga2VybmVsIHZvaWQgZ2Vu TGluZUxvb3BJbmRpY2VzRnJvbUVsZW1lbnRzKHVpbnQgaWR4IFtbdGhyZWFkX3Bvc2l0aW9uX2lu X2dyaWRdXSwKIAogICAgIG91dHB1dFtpZHhdID0KICAgICAgICAgZ2V0SW5kZXhVMzIob3B0aW9u cy5zcmNPZmZzZXQsIGlkeCAlIG9wdGlvbnMuaW5kZXhDb3VudCwgaW5wdXRVOCwgaW5wdXRVMTYs IGlucHV0VTMyKTsKLX0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCit9CmRpZmYgLS1naXQg YS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hh ZGVycy9tdGxfZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRvZ2VuLmluYyBiL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0 X3NoYWRlcnNfc3JjX2F1dG9nZW4uaW5jCmluZGV4IDE0ZTQ3NzJiNGQwM2IxY2I1NmEzMzViOTdi YmEyZjE5MmJiOGM3MjguLjJkN2Q2MWYyNjA0NDlmYTBiNWVhZDU3NGZiYmMwZTA0OTQ1ZTZiN2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4uaW5jCisrKyBi L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9zaGFk ZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4uaW5jCkBAIC03MjQsNiArNzI0LDcg QEAgc3RydWN0IEluZGV4Q29udmVyc2lvblBhcmFtcwogewogICAgIHVpbnQzMl90IHNyY09mZnNl dDsKICAgICB1aW50MzJfdCBpbmRleENvdW50OworICAgIHVpbnQzMl90IG1heEluZGV4OwogICAg IGJvb2wgcHJpbWl0aXZlUmVzdGFydEVuYWJsZWQ7CiB9OwogCkBAIC04OTAsOSArODkxLDkgQEAg a2VybmVsIHZvaWQgZ2VuVHJpRmFuSW5kaWNlc0Zyb21FbGVtZW50cyh1aW50IGlkeCBbW3RocmVh ZF9wb3NpdGlvbl9pbl9ncmlkXV0sCiAKICAgICB1aW50IGVsZW1JZHggPSAyICsgaWR4OwogCi0g ICAgb3V0cHV0WzMgKiBpZHhdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIDAsIGlu cHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7Ci0gICAgb3V0cHV0WzMgKiBpZHggKyAxXSA9IGdl dEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4IC0gMSwgaW5wdXRVOCwgaW5wdXRV MTYsIGlucHV0VTMyKTsKLSAgICBvdXRwdXRbMyAqIGlkeCArIDJdID0gZ2V0SW5kZXhVMzIob3B0 aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHgsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7Cisg ICAgb3V0cHV0WzMgKiBpZHhdID0gKG9wdGlvbnMubWF4SW5kZXggPiAwKSA/IGdldEluZGV4VTMy KG9wdGlvbnMuc3JjT2Zmc2V0LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsK KyAgICBvdXRwdXRbMyAqIGlkeCArIDFdID0gKGVsZW1JZHggLSAxIDwgb3B0aW9ucy5tYXhJbmRl eCkgPyBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCAtIDEsIGlucHV0VTgs IGlucHV0VTE2LCBpbnB1dFUzMikgOiAwOworICAgIG91dHB1dFszICogaWR4ICsgMl0gPSAoZWxl bUlkeCAtIDEgPCBvcHRpb25zLm1heEluZGV4KSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zm c2V0LCBlbGVtSWR4LCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKIH0KIAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvc2hhZGVycy9tdGxfZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRvZ2VuLm1ldGFsIGIvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMv bXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5tZXRhbAppbmRleCAxMzAwZjM3N2NjMDJi MGFiZGI3ZDBkODNkYjFiZTA0Y2RhZTU2MTdhLi5jOWZkMzgxN2ViMjBlZTViZDE5NTYzY2JlNmU5 ZTQ4ZTkwYzJiZWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9tdGxfZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRv Z2VuLm1ldGFsCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5k ZXJlci9tZXRhbC9zaGFkZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4ubWV0YWwK QEAgLTcyMSw2ICs3MjEsNyBAQCBzdHJ1Y3QgSW5kZXhDb252ZXJzaW9uUGFyYW1zCiB7CiAgICAg dWludDMyX3Qgc3JjT2Zmc2V0OwogICAgIHVpbnQzMl90IGluZGV4Q291bnQ7CisgICAgdWludDMy X3QgbWF4SW5kZXg7CiAgICAgYm9vbCBwcmltaXRpdmVSZXN0YXJ0RW5hYmxlZDsKIH07CiAKQEAg LTg4Nyw5ICs4ODgsOSBAQCBrZXJuZWwgdm9pZCBnZW5UcmlGYW5JbmRpY2VzRnJvbUVsZW1lbnRz KHVpbnQgaWR4IFtbdGhyZWFkX3Bvc2l0aW9uX2luX2dyaWRdXSwKIAogICAgIHVpbnQgZWxlbUlk eCA9IDIgKyBpZHg7CiAKLSAgICBvdXRwdXRbMyAqIGlkeF0gPSBnZXRJbmRleFUzMihvcHRpb25z LnNyY09mZnNldCwgMCwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKTsKLSAgICBvdXRwdXRb MyAqIGlkeCArIDFdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHggLSAx LCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOwotICAgIG91dHB1dFszICogaWR4ICsgMl0g PSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCwgaW5wdXRVOCwgaW5wdXRV MTYsIGlucHV0VTMyKTsKKyAgICBvdXRwdXRbMyAqIGlkeF0gPSAob3B0aW9ucy5tYXhJbmRleCA+ IDApID8gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIDAsIGlucHV0VTgsIGlucHV0VTE2 LCBpbnB1dFUzMikgOiAwOworICAgIG91dHB1dFszICogaWR4ICsgMV0gPSAoZWxlbUlkeCAtIDEg PCBvcHRpb25zLm1heEluZGV4KSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVt SWR4IC0gMSwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKSA6IDA7CisgICAgb3V0cHV0WzMg KiBpZHggKyAyXSA9IChlbGVtSWR4IC0gMSA8IG9wdGlvbnMubWF4SW5kZXgpID8gZ2V0SW5kZXhV MzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHgsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUz MikgOiAwOwogfQogCiAK 460916 2022-07-14 17:02:01 -0700 2022-07-14 23:51:44 -0700 Patch bug-242762-20220714170200.patch text/plain 13303 kpiddington ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5oCmluZGV4IDZiZTk2OTBl MTU5ZjNjNTU3M2VhNzY0MTk1MjJlYWE5OWU0Y2Y0NTkuLjdiNmM4YzA1OWUyMWY5NjY4OWYzZmNi N2JmZDg2ODk5YjkxYTgxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLmgKKysrIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9yZW5kZXJf dXRpbHMuaApAQCAtMTQ2LDYgKzE0Niw3IEBAIHN0cnVjdCBJbmRleEdlbmVyYXRpb25QYXJhbXMK ICAgICBCdWZmZXJSZWYgZHN0QnVmZmVyOwogICAgIHVpbnQzMl90IGRzdE9mZnNldDsKICAgICBi b29sIHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkID0gZmFsc2U7CisgICAgR0xzaXplaSBtYXhJbmRl eENvdW50ID0gc3RkOjpudW1lcmljX2xpbWl0czxHTHNpemVpPjo6bWF4KCk7CiB9OwogCiBzdHJ1 Y3QgQ29weVBpeGVsc0NvbW1vblBhcmFtcwpAQCAtMzg4LDYgKzM4OSw3IEBAIGNsYXNzIEluZGV4 R2VuZXJhdG9yVXRpbHMgZmluYWwgOiBhbmdsZTo6Tm9uQ29weWFibGUKICAgICAgICAgQ29udGV4 dE10bCAqY29udGV4dE10bCwKICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5cGUgc3JjVHlwZSwK ICAgICAgICAgdWludDMyX3QgaW5kZXhDb3VudCwKKyAgICAgICAgdWludDMyX3QgbWF4SW5kZXhD b3VudCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZzcmNCdWZmZXIsCiAgICAgICAgIHVpbnQz Ml90IHNyY09mZnNldCwKICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvbXRsX3JlbmRlcl91dGlscy5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJB TkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCmluZGV4IDFlMmI2ODg4ZWYy MDVjMzU1YjIyMjBmYjM2ZDNiODg5YTYxNGZhMjUuLjI0NDY4ODJlMjZkMjlhYWNjY2Y4Yzg2NzBi YjU5YTc1N2IzZTU5NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0 aWxzLm1tCkBAIC04Nyw4ICs4Nyw5IEBAIHN0cnVjdCBJbmRleENvbnZlcnNpb25Vbmlmb3JtCiB7 CiAgICAgdWludDMyX3Qgc3JjT2Zmc2V0OwogICAgIHVpbnQzMl90IGluZGV4Q291bnQ7CisgICAg dWludDMyX3QgbWF4SW5kZXg7CiAgICAgdWludDhfdCBwcmltaXRpdmVSZXN0YXJ0RW5hYmxlZDsK LSAgICB1aW50OF90IHBhZGRpbmdbN107CisgICAgdWludDhfdCBwYWRkaW5nWzNdOwogfTsKIAog Ly8gU2VlIGxpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvdmlzaWJpbGl0eS5tZXRhbApA QCAtMjIyLDkgKzIyMywxNSBAQCB2b2lkIEdldEJsaXRUZXhDb29yZHMoY29uc3QgTm9ybWFsaXpl ZENvb3JkcyAmbm9ybWFsaXplZENvb3JkcywKICAgICB9CiB9CiAKK3RlbXBsYXRlIDx0eXBlbmFt ZSBUPgoraW5saW5lIFQgYWNjZXNzQm91bmRlZChjb25zdCBUICogYXJyYXksIEdMc2l6ZWkgaWR4 LCBHTHNpemVpIG1heElkeCkKK3sKKyAgICByZXR1cm4gaWR4IDwgbWF4SWR4ID8gYXJyYXlbaWR4 XSA6IDA7Cit9CiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KIGFuZ2xlOjpSZXN1bHQgR2VuVHJpRmFu RnJvbUNsaWVudEVsZW1lbnRzKENvbnRleHRNdGwgKmNvbnRleHRNdGwsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTHNpemVpIGNvdW50LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xzaXplaSBtYXhJbmRleCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJpbWl0aXZlUmVzdGFydEVu YWJsZWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBU ICppbmRpY2VzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgQnVmZmVyUmVmICZkc3RCdWZmZXIsCkBAIC0yMzYsMjMgKzI0MywyMyBAQCBhbmdsZTo6UmVz dWx0IEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhDb250ZXh0TXRsICpjb250ZXh0TXRsLAog ICAgIEdMc2l6ZWkgZHN0VHJpYW5nbGUgICAgICAgICAgICAgICAgICAgPSAwOwogICAgIHVpbnQz Ml90ICpkc3RQdHIgPSByZWludGVycHJldF9jYXN0PHVpbnQzMl90ICo+KGRzdEJ1ZmZlci0+bWFw KGNvbnRleHRNdGwpICsgZHN0T2Zmc2V0KTsKICAgICBUIHRyaUZpcnN0SWR4LCBzcmNQcmV2SWR4 OwotICAgIG1lbWNweSgmdHJpRmlyc3RJZHgsIGluZGljZXMsIHNpemVvZih0cmlGaXJzdElkeCkp OwotICAgIG1lbWNweSgmc3JjUHJldklkeCwgaW5kaWNlcyArIDEsIHNpemVvZihzcmNQcmV2SWR4 KSk7Ci0KKyAgICB0cmlGaXJzdElkeCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgMCwgbWF4SW5k ZXgpOworICAgIHNyY1ByZXZJZHggPSAgYWNjZXNzQm91bmRlZChpbmRpY2VzLCAxLCBtYXhJbmRl eCk7CisgICAgCiAgICAgaWYgKHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkKQogICAgIHsKICAgICAg ICAgR0xzaXplaSB0cmlGaXJzdElkeExvYyA9IDA7CiAgICAgICAgIHdoaWxlICh0cmlGaXJzdElk eCA9PSBrU3JjUHJpbWl0aXZlUmVzdGFydEluZGV4KQogICAgICAgICB7CiAgICAgICAgICAgICAr K3RyaUZpcnN0SWR4TG9jOwotICAgICAgICAgICAgbWVtY3B5KCZ0cmlGaXJzdElkeCwgaW5kaWNl cyArIHRyaUZpcnN0SWR4TG9jLCBzaXplb2YodHJpRmlyc3RJZHgpKTsKKyAgICAgICAgICAgIHRy aUZpcnN0SWR4ID0gYWNjZXNzQm91bmRlZChpbmRpY2VzLCB0cmlGaXJzdElkeExvYywgbWF4SW5k ZXgpOwogICAgICAgICB9CiAKICAgICAgICAgZm9yIChHTHNpemVpIGkgPSB0cmlGaXJzdElkeExv YyArIDI7IGkgPCBjb3VudDsgKytpKQogICAgICAgICB7CiAgICAgICAgICAgICB1aW50MzJfdCB0 cmlJbmRpY2VzWzNdOwogICAgICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHko JnNyY0lkeCwgaW5kaWNlcyArIGksIHNpemVvZihzcmNJZHgpKTsKKyAgICAgICAgICAgIHNyY0lk eCA9IGFjY2Vzc0JvdW5kZWQoaW5kaWNlcywgaSwgbWF4SW5kZXgpOwogICAgICAgICAgICAgYm9v bCBjb21wbGV0ZVRyaWFuZ2xlID0gdHJ1ZTsKICAgICAgICAgICAgIGlmIChzcmNQcmV2SWR4ID09 IGtTcmNQcmltaXRpdmVSZXN0YXJ0SW5kZXggfHwgc3JjSWR4ID09IGtTcmNQcmltaXRpdmVSZXN0 YXJ0SW5kZXgpCiAgICAgICAgICAgICB7CkBAIC0yODUsOCArMjkyLDcgQEAgYW5nbGU6OlJlc3Vs dCBHZW5UcmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoQ29udGV4dE10bCAqY29udGV4dE10bCwKICAg ICAgICAgZm9yIChHTHNpemVpIGkgPSAyOyBpIDwgY291bnQ7ICsraSkKICAgICAgICAgewogICAg ICAgICAgICAgVCBzcmNJZHg7Ci0gICAgICAgICAgICBtZW1jcHkoJnNyY0lkeCwgaW5kaWNlcyAr IGksIHNpemVvZihzcmNJZHgpKTsKLQorICAgICAgICAgICAgc3JjSWR4ID0gYWNjZXNzQm91bmRl ZChpbmRpY2VzLGksbWF4SW5kZXgpOwogICAgICAgICAgICAgdWludDMyX3QgdHJpSW5kaWNlc1sz XTsKICAgICAgICAgICAgIHRyaUluZGljZXNbMF0gPSB0cmlGaXJzdElkeDsKICAgICAgICAgICAg IHRyaUluZGljZXNbMV0gPSBzcmNQcmV2SWR4OwpAQCAtMjA4OSwxMSArMjA5NSwxNCBAQCBhbmds ZTo6UmVzdWx0IEluZGV4R2VuZXJhdG9yVXRpbHM6OmdlbmVyYXRlVHJpRmFuQnVmZmVyRnJvbUVs ZW1lbnRzQXJyYXkoCiAgICAgICAgIHNpemVfdCBzcmNPZmZzZXQgICAgICAgICAgICA9IHJlaW50 ZXJwcmV0X2Nhc3Q8c2l6ZV90PihwYXJhbXMuaW5kaWNlcyk7CiAgICAgICAgIEFOR0xFX0NIRUNL KGNvbnRleHRNdGwsIHNyY09mZnNldCA8PSBzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQzMl90Pjo6 bWF4KCksCiAgICAgICAgICAgICAgICAgICAgICJJbmRleCBvZmZzZXQgaXMgdG9vIGxhcmdlIiwg R0xfSU5WQUxJRF9WQUxVRSk7CisgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBsaW1pdGVk UGFyYW1zID0gcGFyYW1zOworICAgICAgICBsaW1pdGVkUGFyYW1zLm1heEluZGV4Q291bnQgPSBz dGQ6Om1pbjxHTHNpemVpPihwYXJhbXMuaW5kZXhDb3VudCwgKEdMc2l6ZWkpKGVsZW1lbnRCdWZm ZXJNdGwtPnNpemUoKSAtIHNyY09mZnNldCkgLyAoR0xzaXplaSlHZXREcmF3RWxlbWVudHNUeXBl U2l6ZShwYXJhbXMuc3JjVHlwZSkpOworICAgICAgICAgICAgICAgIAogICAgICAgICBpZiAocGFy YW1zLnByaW1pdGl2ZVJlc3RhcnRFbmFibGVkIHx8CiAgICAgICAgICAgICAoIWNvbnRleHRNdGwt PmdldERpc3BsYXkoKS0+Z2V0RmVhdHVyZXMoKS5oYXNDaGVhcFJlbmRlclBhc3MuZW5hYmxlZCAm JgogICAgICAgICAgICAgIGNvbnRleHRNdGwtPmdldFJlbmRlckNvbW1hbmRFbmNvZGVyKCkpKQog ICAgICAgICB7Ci0gICAgICAgICAgICBJbmRleEdlbmVyYXRpb25QYXJhbXMgY3B1UGF0aFBhcmFt cyA9IHBhcmFtczsKKyAgICAgICAgICAgIEluZGV4R2VuZXJhdGlvblBhcmFtcyBjcHVQYXRoUGFy YW1zID0gbGltaXRlZFBhcmFtczsKICAgICAgICAgICAgIGNwdVBhdGhQYXJhbXMuaW5kaWNlcyA9 CiAgICAgICAgICAgICAgICAgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q2xpZW50U2hhZG93Q29weURh dGEoY29udGV4dE10bCkgKyBzcmNPZmZzZXQ7CiAgICAgICAgICAgICByZXR1cm4gZ2VuZXJhdGVU cmlGYW5CdWZmZXJGcm9tRWxlbWVudHNBcnJheUNQVShjb250ZXh0TXRsLCBjcHVQYXRoUGFyYW1z LApAQCAtMjEwMiw3ICsyMTExLDcgQEAgYW5nbGU6OlJlc3VsdCBJbmRleEdlbmVyYXRvclV0aWxz OjpnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVtZW50c0FycmF5KAogICAgICAgICBlbHNlCiAg ICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVt ZW50c0FycmF5R1BVKAotICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBl LCBwYXJhbXMuaW5kZXhDb3VudCwgZWxlbWVudEJ1ZmZlck10bC0+Z2V0Q3VycmVudEJ1ZmZlcigp LAorICAgICAgICAgICAgICAgIGNvbnRleHRNdGwsIHBhcmFtcy5zcmNUeXBlLCBwYXJhbXMuaW5k ZXhDb3VudCwgbGltaXRlZFBhcmFtcy5tYXhJbmRleENvdW50LCBlbGVtZW50QnVmZmVyTXRsLT5n ZXRDdXJyZW50QnVmZmVyKCksCiAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8dWludDMyX3Q+ KHNyY09mZnNldCksIHBhcmFtcy5kc3RCdWZmZXIsIHBhcmFtcy5kc3RPZmZzZXQpOwogICAgICAg ICB9CiAgICAgfQpAQCAtMjExNiw2ICsyMTI1LDcgQEAgYW5nbGU6OlJlc3VsdCBJbmRleEdlbmVy YXRvclV0aWxzOjpnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVtZW50c0FycmF5R1BVKAogICAg IENvbnRleHRNdGwgKmNvbnRleHRNdGwsCiAgICAgZ2w6OkRyYXdFbGVtZW50c1R5cGUgc3JjVHlw ZSwKICAgICB1aW50MzJfdCBpbmRleENvdW50LAorICAgIHVpbnQzMl90IG1heEluZGV4Q291bnQs CiAgICAgY29uc3QgQnVmZmVyUmVmICZzcmNCdWZmZXIsCiAgICAgdWludDMyX3Qgc3JjT2Zmc2V0 LAogICAgIGNvbnN0IEJ1ZmZlclJlZiAmZHN0QnVmZmVyLApAQCAtMjE0MCw3ICsyMTUwLDcgQEAg YW5nbGU6OlJlc3VsdCBJbmRleEdlbmVyYXRvclV0aWxzOjpnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZy b21FbGVtZW50c0FycmF5R1BVKAogICAgIEluZGV4Q29udmVyc2lvblVuaWZvcm0gdW5pZm9ybTsK ICAgICB1bmlmb3JtLnNyY09mZnNldCAgPSBzcmNPZmZzZXQ7CiAgICAgdW5pZm9ybS5pbmRleENv dW50ID0gaW5kZXhDb3VudCAtIDI7ICAvLyBPbmx5IHN0YXJ0IGZyb20gdGhlIDNyZCBlbGVtZW50 LgotCisgICAgdW5pZm9ybS5tYXhJbmRleCAgID0gbWF4SW5kZXhDb3VudDsKICAgICBjbWRFbmNv ZGVyLT5zZXREYXRhKHVuaWZvcm0sIDApOwogICAgIGNtZEVuY29kZXItPnNldEJ1ZmZlcihzcmNC dWZmZXIsIDAsIDEpOwogICAgIGNtZEVuY29kZXItPnNldEJ1ZmZlckZvcldyaXRlKGRzdEJ1ZmZl ciwgZHN0T2Zmc2V0LCAyKTsKQEAgLTIxNTgsMTcgKzIxNjgsMTcgQEAgYW5nbGU6OlJlc3VsdCBJ bmRleEdlbmVyYXRvclV0aWxzOjpnZW5lcmF0ZVRyaUZhbkJ1ZmZlckZyb21FbGVtZW50c0FycmF5 Q1BVKAogICAgIHN3aXRjaCAocGFyYW1zLnNyY1R5cGUpCiAgICAgewogICAgICAgICBjYXNlIGds OjpEcmF3RWxlbWVudHNUeXBlOjpVbnNpZ25lZEJ5dGU6Ci0gICAgICAgICAgICByZXR1cm4gR2Vu VHJpRmFuRnJvbUNsaWVudEVsZW1lbnRzKGNvbnRleHRNdGwsIHBhcmFtcy5pbmRleENvdW50LAor ICAgICAgICAgICAgcmV0dXJuIEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50cyhjb250ZXh0TXRs LCBwYXJhbXMuaW5kZXhDb3VudCwgcGFyYW1zLm1heEluZGV4Q291bnQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtcy5wcmltaXRpdmVSZXN0YXJ0 RW5hYmxlZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3RhdGljX2Nhc3Q8Y29uc3QgdWludDhfdCAqPihwYXJhbXMuaW5kaWNlcyksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtcy5kc3RCdWZmZXIsIHBh cmFtcy5kc3RPZmZzZXQsIGdlbkluZGljZXMpOwogICAgICAgICBjYXNlIGdsOjpEcmF3RWxlbWVu dHNUeXBlOjpVbnNpZ25lZFNob3J0OgotICAgICAgICAgICAgcmV0dXJuIEdlblRyaUZhbkZyb21D bGllbnRFbGVtZW50cyhjb250ZXh0TXRsLCBwYXJhbXMuaW5kZXhDb3VudCwKKyAgICAgICAgICAg IHJldHVybiBHZW5UcmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoY29udGV4dE10bCwgcGFyYW1zLmlu ZGV4Q291bnQsIHBhcmFtcy5tYXhJbmRleENvdW50LAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXMucHJpbWl0aXZlUmVzdGFydEVuYWJsZWQsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0 PGNvbnN0IHVpbnQxNl90ICo+KHBhcmFtcy5pbmRpY2VzKSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyYW1zLmRzdEJ1ZmZlciwgcGFyYW1zLmRzdE9m ZnNldCwgZ2VuSW5kaWNlcyk7CiAgICAgICAgIGNhc2UgZ2w6OkRyYXdFbGVtZW50c1R5cGU6OlVu c2lnbmVkSW50OgotICAgICAgICAgICAgcmV0dXJuIEdlblRyaUZhbkZyb21DbGllbnRFbGVtZW50 cyhjb250ZXh0TXRsLCBwYXJhbXMuaW5kZXhDb3VudCwKKyAgICAgICAgICAgIHJldHVybiBHZW5U cmlGYW5Gcm9tQ2xpZW50RWxlbWVudHMoY29udGV4dE10bCwgcGFyYW1zLmluZGV4Q291bnQsIHBh cmFtcy5tYXhJbmRleENvdW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwYXJhbXMucHJpbWl0aXZlUmVzdGFydEVuYWJsZWQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IHVpbnQz Ml90ICo+KHBhcmFtcy5pbmRpY2VzKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcGFyYW1zLmRzdEJ1ZmZlciwgcGFyYW1zLmRzdE9mZnNldCwgZ2VuSW5k aWNlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvc2hhZGVycy9mb3JtYXRfYXV0b2dlbi5oIGIvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvZm9ybWF0X2F1dG9n ZW4uaAppbmRleCBhYmY2YTc0NWJlMzM1Y2NhYWMxNTA4OWI4NTFmMGZlNGRmZDEzODFkLi4yZTVh YWUzY2E2N2ExMzU5ODBiYjMxNzZlNDQ2ZjI1ZTdhNzc4ZWEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9mb3Jt YXRfYXV0b2dlbi5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9y ZW5kZXJlci9tZXRhbC9zaGFkZXJzL2Zvcm1hdF9hdXRvZ2VuLmgKQEAgLTI0OSw1ICsyNDksNSBA QCBlbnVtCiAKIH0KIAotfSAgLy8gbmFtZXNwYWNlIG10bF9zaGFkZXIKLX0gIC8vIG5hbWVzcGFj ZSByeAorfQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvZ2VuX2luZGljZXMubWV0YWwgYi9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9nZW5faW5k aWNlcy5tZXRhbAppbmRleCBlY2VhODg1YWYzMjA2NWFkMWNiOTJmNjU4OGNhYWI1YzJlOGRkODQ3 Li5lMjUxNTZhNWNhN2QxNGQ3ODU1YzhkZTU3YjYxOTM4ODVlMTdiMjJjIDEwMDY0NAotLS0gYS9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVy cy9nZW5faW5kaWNlcy5tZXRhbAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9nZW5faW5kaWNlcy5tZXRhbApAQCAtMjIsNiAr MjIsNyBAQCBzdHJ1Y3QgSW5kZXhDb252ZXJzaW9uUGFyYW1zCiB7CiAgICAgdWludDMyX3Qgc3Jj T2Zmc2V0OyAgLy8gb2Zmc2V0IGluIGJ5dGVzCiAgICAgdWludDMyX3QgaW5kZXhDb3VudDsKKyAg ICB1aW50MzJfdCBtYXhJbmRleDsKICAgICBib29sIHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkOwog fTsKIApAQCAtMTg3LDEwICsxODgsMTAgQEAga2VybmVsIHZvaWQgZ2VuVHJpRmFuSW5kaWNlc0Zy b21FbGVtZW50cyh1aW50IGlkeCBbW3RocmVhZF9wb3NpdGlvbl9pbl9ncmlkXV0sCiAgICAgQU5H TEVfSURYX0NPTlZFUlNJT05fR1VBUkQoaWR4LCBvcHRpb25zKTsKIAogICAgIHVpbnQgZWxlbUlk eCA9IDIgKyBpZHg7Ci0KLSAgICBvdXRwdXRbMyAqIGlkeF0gICAgID0gZ2V0SW5kZXhVMzIob3B0 aW9ucy5zcmNPZmZzZXQsIDAsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7Ci0gICAgb3V0 cHV0WzMgKiBpZHggKyAxXSA9IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4 IC0gMSwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKTsKLSAgICBvdXRwdXRbMyAqIGlkeCAr IDJdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHgsIGlucHV0VTgsIGlu cHV0VTE2LCBpbnB1dFUzMik7CisgICAgCisgICAgb3V0cHV0WzMgKiBpZHhdICAgICA9IChvcHRp b25zLm1heEluZGV4ID4gMCkgICAgICAgICAgID8gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZz ZXQsIDAsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMikgOiAwOworICAgIG91dHB1dFszICog aWR4ICsgMV0gPSAoZWxlbUlkeCAtIDEgPCBvcHRpb25zLm1heEluZGV4KSA/IGdldEluZGV4VTMy KG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4IC0gMSwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0 VTMyKSA6IDA7CisgICAgb3V0cHV0WzMgKiBpZHggKyAyXSA9IChlbGVtSWR4IC0gMSA8IG9wdGlv bnMubWF4SW5kZXgpID8gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHgsIGlu cHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMikgOiAwOwogfQogCiAvLyBHZW5lcmF0ZSBsaW5lIGxv b3AgaW5kaWNlcyBmb3IgZ2xEcmF3QXJyYXkoKQpAQCAtMjIxLDQgKzIyMiw0IEBAIGtlcm5lbCB2 b2lkIGdlbkxpbmVMb29wSW5kaWNlc0Zyb21FbGVtZW50cyh1aW50IGlkeCBbW3RocmVhZF9wb3Np dGlvbl9pbl9ncmlkXV0sCiAKICAgICBvdXRwdXRbaWR4XSA9CiAgICAgICAgIGdldEluZGV4VTMy KG9wdGlvbnMuc3JjT2Zmc2V0LCBpZHggJSBvcHRpb25zLmluZGV4Q291bnQsIGlucHV0VTgsIGlu cHV0VTE2LCBpbnB1dFUzMik7Ci19ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorfQpkaWZm IC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21l dGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5pbmMgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9tdGxf ZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRvZ2VuLmluYwppbmRleCAxNGU0NzcyYjRkMDNiMWNiNTZh MzM1Yjk3YmJhMmYxOTJiYjhjNzI4Li4yZDdkNjFmMjYwNDQ5ZmEwYjVlYWQ1NzRmYmJjMGUwNDk0 NWU2YjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvc2hhZGVycy9tdGxfZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRvZ2VuLmlu YworKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvc2hhZGVycy9tdGxfZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRvZ2VuLmluYwpAQCAtNzI0LDYg KzcyNCw3IEBAIHN0cnVjdCBJbmRleENvbnZlcnNpb25QYXJhbXMKIHsKICAgICB1aW50MzJfdCBz cmNPZmZzZXQ7CiAgICAgdWludDMyX3QgaW5kZXhDb3VudDsKKyAgICB1aW50MzJfdCBtYXhJbmRl eDsKICAgICBib29sIHByaW1pdGl2ZVJlc3RhcnRFbmFibGVkOwogfTsKIApAQCAtODkwLDkgKzg5 MSw5IEBAIGtlcm5lbCB2b2lkIGdlblRyaUZhbkluZGljZXNGcm9tRWxlbWVudHModWludCBpZHgg W1t0aHJlYWRfcG9zaXRpb25faW5fZ3JpZF1dLAogCiAgICAgdWludCBlbGVtSWR4ID0gMiArIGlk eDsKIAotICAgIG91dHB1dFszICogaWR4XSA9IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0 LCAwLCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpOwotICAgIG91dHB1dFszICogaWR4ICsg MV0gPSBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgZWxlbUlkeCAtIDEsIGlucHV0VTgs IGlucHV0VTE2LCBpbnB1dFUzMik7Ci0gICAgb3V0cHV0WzMgKiBpZHggKyAyXSA9IGdldEluZGV4 VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4LCBpbnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRV MzIpOworICAgIG91dHB1dFszICogaWR4XSA9IChvcHRpb25zLm1heEluZGV4ID4gMCkgPyBnZXRJ bmRleFUzMihvcHRpb25zLnNyY09mZnNldCwgMCwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMy KSA6IDA7CisgICAgb3V0cHV0WzMgKiBpZHggKyAxXSA9IChlbGVtSWR4IC0gMSA8IG9wdGlvbnMu bWF4SW5kZXgpID8gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHggLSAxLCBp bnB1dFU4LCBpbnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKKyAgICBvdXRwdXRbMyAqIGlkeCArIDJd ID0gKGVsZW1JZHggLSAxIDwgb3B0aW9ucy5tYXhJbmRleCkgPyBnZXRJbmRleFUzMihvcHRpb25z LnNyY09mZnNldCwgZWxlbUlkeCwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKSA6IDA7CiB9 CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19zcmNfYXV0b2dlbi5tZXRh bCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9z aGFkZXJzL210bF9kZWZhdWx0X3NoYWRlcnNfc3JjX2F1dG9nZW4ubWV0YWwKaW5kZXggMTMwMGYz NzdjYzAyYjBhYmRiN2QwZDgzZGIxYmUwNGNkYWU1NjE3YS4uYzlmZDM4MTdlYjIwZWU1YmQxOTU2 M2NiZTZlOWU0OGU5MGMyYmVmMiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL3NoYWRlcnMvbXRsX2RlZmF1bHRfc2hhZGVyc19z cmNfYXV0b2dlbi5tZXRhbAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvbWV0YWwvc2hhZGVycy9tdGxfZGVmYXVsdF9zaGFkZXJzX3NyY19hdXRvZ2Vu Lm1ldGFsCkBAIC03MjEsNiArNzIxLDcgQEAgc3RydWN0IEluZGV4Q29udmVyc2lvblBhcmFtcwog ewogICAgIHVpbnQzMl90IHNyY09mZnNldDsKICAgICB1aW50MzJfdCBpbmRleENvdW50OworICAg IHVpbnQzMl90IG1heEluZGV4OwogICAgIGJvb2wgcHJpbWl0aXZlUmVzdGFydEVuYWJsZWQ7CiB9 OwogCkBAIC04ODcsOSArODg4LDkgQEAga2VybmVsIHZvaWQgZ2VuVHJpRmFuSW5kaWNlc0Zyb21F bGVtZW50cyh1aW50IGlkeCBbW3RocmVhZF9wb3NpdGlvbl9pbl9ncmlkXV0sCiAKICAgICB1aW50 IGVsZW1JZHggPSAyICsgaWR4OwogCi0gICAgb3V0cHV0WzMgKiBpZHhdID0gZ2V0SW5kZXhVMzIo b3B0aW9ucy5zcmNPZmZzZXQsIDAsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMik7Ci0gICAg b3V0cHV0WzMgKiBpZHggKyAxXSA9IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVt SWR4IC0gMSwgaW5wdXRVOCwgaW5wdXRVMTYsIGlucHV0VTMyKTsKLSAgICBvdXRwdXRbMyAqIGlk eCArIDJdID0gZ2V0SW5kZXhVMzIob3B0aW9ucy5zcmNPZmZzZXQsIGVsZW1JZHgsIGlucHV0VTgs IGlucHV0VTE2LCBpbnB1dFUzMik7CisgICAgb3V0cHV0WzMgKiBpZHhdID0gKG9wdGlvbnMubWF4 SW5kZXggPiAwKSA/IGdldEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCAwLCBpbnB1dFU4LCBp bnB1dFUxNiwgaW5wdXRVMzIpIDogMDsKKyAgICBvdXRwdXRbMyAqIGlkeCArIDFdID0gKGVsZW1J ZHggLSAxIDwgb3B0aW9ucy5tYXhJbmRleCkgPyBnZXRJbmRleFUzMihvcHRpb25zLnNyY09mZnNl dCwgZWxlbUlkeCAtIDEsIGlucHV0VTgsIGlucHV0VTE2LCBpbnB1dFUzMikgOiAwOworICAgIG91 dHB1dFszICogaWR4ICsgMl0gPSAoZWxlbUlkeCAtIDEgPCBvcHRpb25zLm1heEluZGV4KSA/IGdl dEluZGV4VTMyKG9wdGlvbnMuc3JjT2Zmc2V0LCBlbGVtSWR4LCBpbnB1dFU4LCBpbnB1dFUxNiwg aW5wdXRVMzIpIDogMDsKIH0KIAogCg==