187405 2018-07-06 13:03:07 -0700 Make ReasonForSuspension enum class 2018-07-06 19:57:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa cdumez commit-queue koivisto webkit-bug-importer zalan oldest_to_newest 1439883 0 rniwa 2018-07-06 13:03:07 -0700 Make ReasonForSuspension enum class 1439887 1 344445 rniwa 2018-07-06 13:08:07 -0700 Created attachment 344445 Patch 1440065 2 344445 commit-queue 2018-07-06 19:56:27 -0700 Comment on attachment 344445 Patch Clearing flags on attachment: 344445 Committed r233611: <https://trac.webkit.org/changeset/233611> 1440066 3 commit-queue 2018-07-06 19:56:29 -0700 All reviewed patches have been landed. Closing bug. 1440068 4 webkit-bug-importer 2018-07-06 19:57:16 -0700 <rdar://problem/41919224> 344445 2018-07-06 13:08:07 -0700 2018-07-06 19:56:27 -0700 Patch bug-187405-20180706130806.patch text/plain 23137 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzU4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUxIEBACisyMDE4LTA3LTA2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgUmVhc29uRm9yU3VzcGVu c2lvbiBlbnVtIGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODc0MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBNYWRlIFJlYXNvbkZvclN1c3BlbnNpb24gYW4gZW51bSBjbGFzcyBpbnN0ZWFkIG9m IGVudW0gYW5kIG1vdmVkIG91dCBvZiBBY3RpdmVET01PYmplY3QuCisKKyAgICAgICAgKiBNb2R1 bGVzL2dlb2xvY2F0aW9uL0dlb2xvY2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xv Y2F0aW9uOjpzdXNwZW5kKToKKyAgICAgICAgKiBNb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldDo6c3VzcGVuZCk6CisgICAgICAgICog ZG9tL0FjdGl2ZURPTU9iamVjdC5oOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGlkQmVjb21lQ3VycmVudERvY3VtZW50SW5GcmFtZSk6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c3VzcGVuZEFjdGl2ZURPTU9iamVjdHMpOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlc3VtZUFjdGl2ZURPTU9iamVjdHMpOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnN1c3BlbmQpOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnQ6OnJlc3VtZSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c3VzcGVuZFNjaGVk dWxlZFRhc2tzKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZXN1bWVTY2hlZHVsZWRU YXNrcyk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgICogZG9tL1NjcmlwdEV4 ZWN1dGlvbkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29u dGV4dDo6c3VzcGVuZEFjdGl2ZURPTU9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0 RXhlY3V0aW9uQ29udGV4dDo6cmVzdW1lQWN0aXZlRE9NT2JqZWN0cyk6CisgICAgICAgICogZG9t L1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ6OnJlYXNvbkZvclN1c3BlbmRpbmdBY3RpdmVET01PYmplY3RzIGNvbnN0KToK KyAgICAgICAgKiBoaXN0b3J5L0NhY2hlZEZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNh Y2hlZEZyYW1lQmFzZTo6cmVzdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRGcmFtZTo6 Q2FjaGVkRnJhbWUpOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzdXNwZW5kKToKKyAgICAgICAgKiBodG1s L0hUTUxTb3VyY2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3VyY2VFbGVt ZW50OjpzdXNwZW5kKToKKyAgICAgICAgKiBpbnNwZWN0b3IvUGFnZVNjcmlwdERlYnVnU2VydmVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VTY3JpcHREZWJ1Z1NlcnZlcjo6c2V0SmF2YVNj cmlwdFBhdXNlZCk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQpOgorICAgICAgICAq IHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnN1c3BlbmRBY3RpdmVE T01PYmplY3RzQW5kQW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6cmVzdW1l QWN0aXZlRE9NT2JqZWN0c0FuZEFuaW1hdGlvbnMpOgorICAgICAgICAqIHBhZ2UvUGFnZUdyb3Vw TG9hZERlZmVycmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cExvYWREZWZlcnJl cjo6UGFnZUdyb3VwTG9hZERlZmVycmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cExv YWREZWZlcnJlcjo6flBhZ2VHcm91cExvYWREZWZlcnJlcik6CisgICAgICAgICogeG1sL1hNTEh0 dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpzdXNwZW5k KToKKwogMjAxOC0wNy0wNiAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAg ICAgICAgIFtXZWIgQW5pbWF0aW9uc10gTWFrZSBXUFQgdGVzdCBhdCBpbnRlcmZhY2VzL0tleWZy YW1lRWZmZWN0L3Byb2Nlc3NpbmctYS1rZXlmcmFtZXMtYXJndW1lbnQtMDAyLmh0bWwgcGFzcyBy ZWxpYWJseQpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9nZW9sb2NhdGlvbi9HZW9sb2Nh dGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9nZW9sb2NhdGlv bi9HZW9sb2NhdGlvbi5jcHAJKHJldmlzaW9uIDIzMzU4NSkKKysrIFNvdXJjZS9XZWJDb3JlL01v ZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQs NyArMTY0LDcgQEAgYm9vbCBHZW9sb2NhdGlvbjo6Y2FuU3VzcGVuZEZvckRvY3VtZW50UwogICAg IAogdm9pZCBHZW9sb2NhdGlvbjo6c3VzcGVuZChSZWFzb25Gb3JTdXNwZW5zaW9uIHJlYXNvbikK IHsKLSAgICBpZiAocmVhc29uID09IEFjdGl2ZURPTU9iamVjdDo6UGFnZUNhY2hlKSB7CisgICAg aWYgKHJlYXNvbiA9PSBSZWFzb25Gb3JTdXNwZW5zaW9uOjpQYWdlQ2FjaGUpIHsKICAgICAgICAg c3RvcCgpOwogICAgICAgICBtX3Jlc2V0T25SZXN1bWUgPSB0cnVlOwogICAgIH0KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwCShyZXZp c2lvbiAyMzM1ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29j a2V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAyLDcgKzUwMiw3IEBAIHZvaWQgV2ViU29ja2V0 OjpzdXNwZW5kKFJlYXNvbkZvclN1c3BlbnMKICAgICBtX3Nob3VsZERlbGF5RXZlbnRGaXJpbmcg PSB0cnVlOwogCiAgICAgaWYgKG1fY2hhbm5lbCkgewotICAgICAgICBpZiAocmVhc29uID09IEFj dGl2ZURPTU9iamVjdDo6UGFnZUNhY2hlKSB7CisgICAgICAgIGlmIChyZWFzb24gPT0gUmVhc29u Rm9yU3VzcGVuc2lvbjo6UGFnZUNhY2hlKSB7CiAgICAgICAgICAgICAvLyBUaGlzIHdpbGwgY2F1 c2UgZGlkQ2xvc2UoKSB0byBiZSBjYWxsZWQuCiAgICAgICAgICAgICBtX2NoYW5uZWwtPmZhaWwo IldlYlNvY2tldCBpcyBjbG9zZWQgZHVlIHRvIHN1c3BlbnNpb24uIik7CiAgICAgICAgIH0gZWxz ZQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0FjdGl2ZURPTU9iamVjdC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9BY3RpdmVET01PYmplY3QuaAkocmV2aXNpb24gMjMzNTg1 KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0FjdGl2ZURPTU9iamVjdC5oCSh3b3JraW5nIGNvcHkp CkBAIC0zNCw2ICszNCwxMyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2VudW0gY2xhc3Mg UmVhc29uRm9yU3VzcGVuc2lvbiB7CisgICAgSmF2YVNjcmlwdERlYnVnZ2VyUGF1c2VkLAorICAg IFdpbGxEZWZlckxvYWRpbmcsCisgICAgUGFnZUNhY2hlLAorICAgIFBhZ2VXaWxsQmVTdXNwZW5k ZWQsCit9OworCiBjbGFzcyBBY3RpdmVET01PYmplY3QgOiBwdWJsaWMgQ29udGV4dERlc3RydWN0 aW9uT2JzZXJ2ZXIgewogcHVibGljOgogICAgIC8vIFRoZSBzdXNwZW5kSWZOZWVkZWQgbXVzdCBi ZSBjYWxsZWQgZXhhY3RseSBvbmNlIGFmdGVyIG9iamVjdCBjb25zdHJ1Y3Rpb24gdG8gdXBkYXRl CkBAIC01MSwxMyArNTgsNiBAQCBwdWJsaWM6CiAgICAgLy8gVGhhdCBoYXBwZW5zIGluIHN0ZXAt Ynktc3RlcCBKUyBkZWJ1Z2dpbmcgZm9yIGV4YW1wbGUgLSBpbiB0aGlzIGNhc2UgaXQgd291bGQg YmUgaW5jb3JyZWN0CiAgICAgLy8gdG8gc3RvcCB0aGUgb2JqZWN0LiBFeGFjdCBzZW1hbnRpY3Mg b2Ygc3VzcGVuZCBpcyB1cCB0byB0aGUgb2JqZWN0IGluIGNhc2VzIGxpa2UgdGhhdC4KIAotICAg IGVudW0gUmVhc29uRm9yU3VzcGVuc2lvbiB7Ci0gICAgICAgIEphdmFTY3JpcHREZWJ1Z2dlclBh dXNlZCwKLSAgICAgICAgV2lsbERlZmVyTG9hZGluZywKLSAgICAgICAgUGFnZUNhY2hlLAotICAg ICAgICBQYWdlV2lsbEJlU3VzcGVuZGVkLAotICAgIH07Ci0KICAgICB2aXJ0dWFsIGNvbnN0IGNo YXIqIGFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdCA9IDA7CiAKICAgICAvLyBUaGVzZSB0aHJl ZSBmdW5jdGlvbnMgbXVzdCBub3QgaGF2ZSBhIHNpZGUgZWZmZWN0IG9mIGNyZWF0aW5nIG9yIGRl c3Ryb3lpbmcKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjMzNTg1KQor KysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI2 MSw5ICsyMjYxLDkgQEAgdm9pZCBEb2N1bWVudDo6ZGlkQmVjb21lQ3VycmVudERvY3VtZW50SQog ICAgICAgICAgICAgdGltZWxpbmUoKS5zdXNwZW5kQW5pbWF0aW9ucygpOwogICAgICAgICBlbHNl CiAgICAgICAgICAgICBtX2ZyYW1lLT5hbmltYXRpb24oKS5zdXNwZW5kQW5pbWF0aW9uc0ZvckRv Y3VtZW50KHRoaXMpOwotICAgICAgICBzdXNwZW5kU2NoZWR1bGVkVGFza3MoQWN0aXZlRE9NT2Jq ZWN0OjpQYWdlV2lsbEJlU3VzcGVuZGVkKTsKKyAgICAgICAgc3VzcGVuZFNjaGVkdWxlZFRhc2tz KFJlYXNvbkZvclN1c3BlbnNpb246OlBhZ2VXaWxsQmVTdXNwZW5kZWQpOwogICAgIH0gZWxzZSB7 Ci0gICAgICAgIHJlc3VtZVNjaGVkdWxlZFRhc2tzKEFjdGl2ZURPTU9iamVjdDo6UGFnZVdpbGxC ZVN1c3BlbmRlZCk7CisgICAgICAgIHJlc3VtZVNjaGVkdWxlZFRhc2tzKFJlYXNvbkZvclN1c3Bl bnNpb246OlBhZ2VXaWxsQmVTdXNwZW5kZWQpOwogICAgICAgICBpZiAoUnVudGltZUVuYWJsZWRG ZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS53ZWJBbmltYXRpb25zQ1NTSW50ZWdyYXRpb25FbmFi bGVkKCkpCiAgICAgICAgICAgICB0aW1lbGluZSgpLnJlc3VtZUFuaW1hdGlvbnMoKTsKICAgICAg ICAgZWxzZQpAQCAtMjUyMywxNCArMjUyMywxNCBAQCB2b2lkIERvY3VtZW50OjpwbGF0Zm9ybVN1 c3BlbmRPclN0b3BBY3RpCiAjZW5kaWYKIH0KIAotdm9pZCBEb2N1bWVudDo6c3VzcGVuZEFjdGl2 ZURPTU9iamVjdHMoQWN0aXZlRE9NT2JqZWN0OjpSZWFzb25Gb3JTdXNwZW5zaW9uIHdoeSkKK3Zv aWQgRG9jdW1lbnQ6OnN1c3BlbmRBY3RpdmVET01PYmplY3RzKFJlYXNvbkZvclN1c3BlbnNpb24g d2h5KQogewogICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnN1c3BlbmRBY3RpdmVET01PYmpl Y3RzKHdoeSk7CiAgICAgc3VzcGVuZERldmljZU1vdGlvbkFuZE9yaWVudGF0aW9uVXBkYXRlcygp OwogICAgIHBsYXRmb3JtU3VzcGVuZE9yU3RvcEFjdGl2ZURPTU9iamVjdHMoKTsKIH0KIAotdm9p ZCBEb2N1bWVudDo6cmVzdW1lQWN0aXZlRE9NT2JqZWN0cyhBY3RpdmVET01PYmplY3Q6OlJlYXNv bkZvclN1c3BlbnNpb24gd2h5KQordm9pZCBEb2N1bWVudDo6cmVzdW1lQWN0aXZlRE9NT2JqZWN0 cyhSZWFzb25Gb3JTdXNwZW5zaW9uIHdoeSkKIHsKICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0 OjpyZXN1bWVBY3RpdmVET01PYmplY3RzKHdoeSk7CiAgICAgcmVzdW1lRGV2aWNlTW90aW9uQW5k T3JpZW50YXRpb25VcGRhdGVzKCk7CkBAIC00ODk3LDcgKzQ4OTcsNyBAQCB2b2lkIERvY3VtZW50 Ojpkb2N1bWVudFdpbGxCZWNvbWVJbmFjdGl2CiAgICAgICAgIHJlbmRlclZpZXcoKS0+c2V0SXNJ bldpbmRvdyhmYWxzZSk7CiB9CiAKLXZvaWQgRG9jdW1lbnQ6OnN1c3BlbmQoQWN0aXZlRE9NT2Jq ZWN0OjpSZWFzb25Gb3JTdXNwZW5zaW9uIHJlYXNvbikKK3ZvaWQgRG9jdW1lbnQ6OnN1c3BlbmQo UmVhc29uRm9yU3VzcGVuc2lvbiByZWFzb24pCiB7CiAgICAgaWYgKG1faXNTdXNwZW5kZWQpCiAg ICAgICAgIHJldHVybjsKQEAgLTQ5MzAsNyArNDkzMCw3IEBAIHZvaWQgRG9jdW1lbnQ6OnN1c3Bl bmQoQWN0aXZlRE9NT2JqZWN0OjoKICNlbmRpZgogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VS KQotICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNlcnZp Y2VXb3JrZXJFbmFibGVkKCkgJiYgcmVhc29uID09IEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9y U3VzcGVuc2lvbjo6UGFnZUNhY2hlKSB7CisgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6 OnNoYXJlZEZlYXR1cmVzKCkuc2VydmljZVdvcmtlckVuYWJsZWQoKSAmJiByZWFzb24gPT0gUmVh c29uRm9yU3VzcGVuc2lvbjo6UGFnZUNhY2hlKSB7CiAgICAgICAgIEFTU0VSVF9XSVRIX01FU1NB R0UoIWFjdGl2ZVNlcnZpY2VXb3JrZXIoKSwgIkRvY3VtZW50cyB3aXRoIGFuIGFjdGl2ZSBzZXJ2 aWNlIHdvcmtlciBzaG91bGQgbm90IGdvIGludG8gUGFnZUNhY2hlIGluIHRoZSBmaXJzdCBwbGFj ZSIpOwogICAgICAgICBzZXRTZXJ2aWNlV29ya2VyQ29ubmVjdGlvbihudWxscHRyKTsKICAgICB9 CkBAIC00OTQ3LDcgKzQ5NDcsNyBAQCB2b2lkIERvY3VtZW50OjpzdXNwZW5kKEFjdGl2ZURPTU9i amVjdDo6CiAgICAgbV9pc1N1c3BlbmRlZCA9IHRydWU7CiB9CiAKLXZvaWQgRG9jdW1lbnQ6OnJl c3VtZShBY3RpdmVET01PYmplY3Q6OlJlYXNvbkZvclN1c3BlbnNpb24gcmVhc29uKQordm9pZCBE b2N1bWVudDo6cmVzdW1lKFJlYXNvbkZvclN1c3BlbnNpb24gcmVhc29uKQogewogICAgIGlmICgh bV9pc1N1c3BlbmRlZCkKICAgICAgICAgcmV0dXJuOwpAQCAtNDk3Niw3ICs0OTc2LDcgQEAgdm9p ZCBEb2N1bWVudDo6cmVzdW1lKEFjdGl2ZURPTU9iamVjdDo6UgogICAgIG1faXNTdXNwZW5kZWQg PSBmYWxzZTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKLSAgICBpZiAoUnVudGltZUVu YWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXJ2aWNlV29ya2VyRW5hYmxlZCgpICYm IHJlYXNvbiA9PSBBY3RpdmVET01PYmplY3Q6OlJlYXNvbkZvclN1c3BlbnNpb246OlBhZ2VDYWNo ZSkgeworICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNl cnZpY2VXb3JrZXJFbmFibGVkKCkgJiYgcmVhc29uID09IFJlYXNvbkZvclN1c3BlbnNpb246OlBh Z2VDYWNoZSkgewogICAgICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFhY3RpdmVTZXJ2aWNlV29y a2VyKCksICJEb2N1bWVudHMgd2l0aCBhbiBhY3RpdmUgc2VydmljZSB3b3JrZXIgc2hvdWxkIG5v dCBnbyBpbnRvIFBhZ2VDYWNoZSBpbiB0aGUgZmlyc3QgcGxhY2UiKTsKICAgICAgICAgc2V0U2Vy dmljZVdvcmtlckNvbm5lY3Rpb24oU2VydmljZVdvcmtlclByb3ZpZGVyOjpzaW5nbGV0b24oKS5l eGlzdGluZ1NlcnZpY2VXb3JrZXJDb25uZWN0aW9uRm9yU2Vzc2lvbihzZXNzaW9uSUQoKSkpOwog ICAgIH0KQEAgLTU4NjQsMTMgKzU4NjQsMTMgQEAgdm9pZCBEb2N1bWVudDo6cGVuZGluZ1Rhc2tz VGltZXJGaXJlZCgpCiAgICAgICAgIHRhc2sucGVyZm9ybVRhc2soKnRoaXMpOwogfQogCi12b2lk IERvY3VtZW50OjpzdXNwZW5kU2NoZWR1bGVkVGFza3MoQWN0aXZlRE9NT2JqZWN0OjpSZWFzb25G b3JTdXNwZW5zaW9uIHJlYXNvbikKK3ZvaWQgRG9jdW1lbnQ6OnN1c3BlbmRTY2hlZHVsZWRUYXNr cyhSZWFzb25Gb3JTdXNwZW5zaW9uIHJlYXNvbikKIHsKICAgICBpZiAobV9zY2hlZHVsZWRUYXNr c0FyZVN1c3BlbmRlZCkgewogICAgICAgICAvLyBBIHBhZ2UgbWF5IHN1YnNlcXVlbnRseSBzdXNw ZW5kIERPTSBvYmplY3RzLCBzYXkgYXMgcGFydCBvZiBoYW5kbGluZyBhIHNjcm9sbCBvciB6b29t IGdlc3R1cmUsIGFmdGVyIHRoZQogICAgICAgICAvLyBlbWJlZGRpbmcgY2xpZW50IHJlcXVlc3Rl ZCB0aGUgcGFnZSBiZSBzdXNwZW5kZWQuIFdlIGlnbm9yZSBzdWNoIHJlcXVlc3RzIHNvIGxvbmcg YXMgdGhlIGVtYmVkZGluZyBjbGllbnQKICAgICAgICAgLy8gcmVxdWVzdGVkIHRoZSBzdXNwZW5z aW9uIGZpcnN0LiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzEzNzU0ODk2PiBmb3IgbW9yZSBkZXRhaWxz LgotICAgICAgICBBU1NFUlQocmVhc29uRm9yU3VzcGVuZGluZ0FjdGl2ZURPTU9iamVjdHMoKSA9 PSBBY3RpdmVET01PYmplY3Q6OlBhZ2VXaWxsQmVTdXNwZW5kZWQpOworICAgICAgICBBU1NFUlQo cmVhc29uRm9yU3VzcGVuZGluZ0FjdGl2ZURPTU9iamVjdHMoKSA9PSBSZWFzb25Gb3JTdXNwZW5z aW9uOjpQYWdlV2lsbEJlU3VzcGVuZGVkKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAt NTg4NywyMCArNTg4NywyMCBAQCB2b2lkIERvY3VtZW50OjpzdXNwZW5kU2NoZWR1bGVkVGFza3Mo QWN0CiAgICAgLy8gKGUuZy4gd2hpbGUgZGlzcGxheWluZyBhbiBhbGVydCkuCiAgICAgLy8gSXQg aXMgbm90IGN1cnJlbnRseSBwb3NzaWJsZSB0byBzdXNwZW5kIHBhcnNlciB1bmxlc3MgbG9hZGlu ZyBpcyBkZWZlcnJlZCwgYmVjYXVzZSBuZXcgZGF0YSBhcnJpdmluZyBmcm9tIG5ldHdvcmsKICAg ICAvLyB3aWxsIHRyaWdnZXIgcGFyc2luZywgYW5kIGxlYXZlIHRoZSBzY2hlZHVsZXIgaW4gYW4g aW5jb25zaXN0ZW50IHN0YXRlIHdoZXJlIGl0IGRvZXNuJ3Qga25vdyB3aGV0aGVyIGl0J3Mgc3Vz cGVuZGVkIG9yIG5vdC4KLSAgICBpZiAocmVhc29uID09IEFjdGl2ZURPTU9iamVjdDo6V2lsbERl ZmVyTG9hZGluZyAmJiBtX3BhcnNlcikKKyAgICBpZiAocmVhc29uID09IFJlYXNvbkZvclN1c3Bl bnNpb246OldpbGxEZWZlckxvYWRpbmcgJiYgbV9wYXJzZXIpCiAgICAgICAgIG1fcGFyc2VyLT5z dXNwZW5kU2NoZWR1bGVkVGFza3MoKTsKIAogICAgIG1fc2NoZWR1bGVkVGFza3NBcmVTdXNwZW5k ZWQgPSB0cnVlOwogfQogCi12b2lkIERvY3VtZW50OjpyZXN1bWVTY2hlZHVsZWRUYXNrcyhBY3Rp dmVET01PYmplY3Q6OlJlYXNvbkZvclN1c3BlbnNpb24gcmVhc29uKQordm9pZCBEb2N1bWVudDo6 cmVzdW1lU2NoZWR1bGVkVGFza3MoUmVhc29uRm9yU3VzcGVuc2lvbiByZWFzb24pCiB7CiAgICAg aWYgKHJlYXNvbkZvclN1c3BlbmRpbmdBY3RpdmVET01PYmplY3RzKCkgIT0gcmVhc29uKQogICAg ICAgICByZXR1cm47CiAKICAgICBBU1NFUlQobV9zY2hlZHVsZWRUYXNrc0FyZVN1c3BlbmRlZCk7 CiAKLSAgICBpZiAocmVhc29uID09IEFjdGl2ZURPTU9iamVjdDo6V2lsbERlZmVyTG9hZGluZyAm JiBtX3BhcnNlcikKKyAgICBpZiAocmVhc29uID09IFJlYXNvbkZvclN1c3BlbnNpb246OldpbGxE ZWZlckxvYWRpbmcgJiYgbV9wYXJzZXIpCiAgICAgICAgIG1fcGFyc2VyLT5yZXN1bWVTY2hlZHVs ZWRUYXNrcygpOwogCiAjaWYgRU5BQkxFKFhTTFQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAko cmV2aXNpb24gMjMzNTg1KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTYwNCw4ICs2MDQsOCBAQCBwdWJsaWM6CiAKICAgICAvLyBPdmVycmlkZSBT Y3JpcHRFeGVjdXRpb25Db250ZXh0IG1ldGhvZHMgdG8gZG8gYWRkaXRpb25hbCB3b3JrCiAgICAg V0VCQ09SRV9FWFBPUlQgYm9vbCBzaG91bGRCeXBhc3NNYWluV29ybGRDb250ZW50U2VjdXJpdHlQ b2xpY3koKSBjb25zdCBmaW5hbDsKLSAgICB2b2lkIHN1c3BlbmRBY3RpdmVET01PYmplY3RzKEFj dGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbikgZmluYWw7Ci0gICAgdm9pZCByZXN1 bWVBY3RpdmVET01PYmplY3RzKEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbikg ZmluYWw7CisgICAgdm9pZCBzdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyhSZWFzb25Gb3JTdXNwZW5z aW9uKSBmaW5hbDsKKyAgICB2b2lkIHJlc3VtZUFjdGl2ZURPTU9iamVjdHMoUmVhc29uRm9yU3Vz cGVuc2lvbikgZmluYWw7CiAgICAgdm9pZCBzdG9wQWN0aXZlRE9NT2JqZWN0cygpIGZpbmFsOwog CiAgICAgdm9pZCBzdXNwZW5kRGV2aWNlTW90aW9uQW5kT3JpZW50YXRpb25VcGRhdGVzKCk7CkBA IC0xMDM2LDggKzEwMzYsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCB1bnJlZ2lzdGVyRm9yRG9jdW1l bnRTdXNwZW5zaW9uQ2FsbGJhY2tzKEVsZW1lbnQqKTsKIAogICAgIHZvaWQgZG9jdW1lbnRXaWxs QmVjb21lSW5hY3RpdmUoKTsKLSAgICB2b2lkIHN1c3BlbmQoQWN0aXZlRE9NT2JqZWN0OjpSZWFz b25Gb3JTdXNwZW5zaW9uKTsKLSAgICB2b2lkIHJlc3VtZShBY3RpdmVET01PYmplY3Q6OlJlYXNv bkZvclN1c3BlbnNpb24pOworICAgIHZvaWQgc3VzcGVuZChSZWFzb25Gb3JTdXNwZW5zaW9uKTsK KyAgICB2b2lkIHJlc3VtZShSZWFzb25Gb3JTdXNwZW5zaW9uKTsKIAogICAgIHZvaWQgcmVnaXN0 ZXJGb3JNZWRpYVZvbHVtZUNhbGxiYWNrcyhFbGVtZW50Kik7CiAgICAgdm9pZCB1bnJlZ2lzdGVy Rm9yTWVkaWFWb2x1bWVDYWxsYmFja3MoRWxlbWVudCopOwpAQCAtMTI1MSw4ICsxMjUxLDggQEAg cHVibGljOgogCiAgICAgYm9vbCBpc0luRG9jdW1lbnRXcml0ZSgpIHsgcmV0dXJuIG1fd3JpdGVS ZWN1cnNpb25EZXB0aCA+IDA7IH0KIAotICAgIHZvaWQgc3VzcGVuZFNjaGVkdWxlZFRhc2tzKEFj dGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbik7Ci0gICAgdm9pZCByZXN1bWVTY2hl ZHVsZWRUYXNrcyhBY3RpdmVET01PYmplY3Q6OlJlYXNvbkZvclN1c3BlbnNpb24pOworICAgIHZv aWQgc3VzcGVuZFNjaGVkdWxlZFRhc2tzKFJlYXNvbkZvclN1c3BlbnNpb24pOworICAgIHZvaWQg cmVzdW1lU2NoZWR1bGVkVGFza3MoUmVhc29uRm9yU3VzcGVuc2lvbik7CiAKICNpZiBFTkFCTEUo Q1NTX0RFVklDRV9BREFQVEFUSU9OKQogICAgIEludFNpemUgaW5pdGlhbFZpZXdwb3J0U2l6ZSgp IGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250 ZXh0LmNwcAkocmV2aXNpb24gMjMzNTg1KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4 ZWN1dGlvbkNvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTYsNyArMjU2LDcgQEAgYm9v bCBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpjYW5TdXNwZW5kQQogICAgIHJldHVybiBjYW5TdXNw ZW5kOwogfQogCi12b2lkIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnN1c3BlbmRBY3RpdmVET01P YmplY3RzKEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCit2b2lkIFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnN1c3BlbmRBY3RpdmVET01PYmplY3RzKFJlYXNvbkZvclN1 c3BlbnNpb24gd2h5KQogewogICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKIApAQCAtMjY0LDcgKzI2 NCw3IEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6c3VzcGVuZEFjdGkKICAgICAgICAg Ly8gQSBwYWdlIG1heSBzdWJzZXF1ZW50bHkgc3VzcGVuZCBET00gb2JqZWN0cywgc2F5IGFzIHBh cnQgb2YgZW50ZXJpbmcgdGhlIHBhZ2UgY2FjaGUsIGFmdGVyIHRoZSBlbWJlZGRpbmcKICAgICAg ICAgLy8gY2xpZW50IHJlcXVlc3RlZCB0aGUgcGFnZSBiZSBzdXNwZW5kZWQuIFdlIGlnbm9yZSBz dWNoIHJlcXVlc3RzIHNvIGxvbmcgYXMgdGhlIGVtYmVkZGluZyBjbGllbnQgcmVxdWVzdGVkCiAg ICAgICAgIC8vIHRoZSBzdXNwZW5zaW9uIGZpcnN0LiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzEzNzU0 ODk2PiBmb3IgbW9yZSBkZXRhaWxzLgotICAgICAgICBBU1NFUlQobV9yZWFzb25Gb3JTdXNwZW5k aW5nQWN0aXZlRE9NT2JqZWN0cyA9PSBBY3RpdmVET01PYmplY3Q6OlBhZ2VXaWxsQmVTdXNwZW5k ZWQpOworICAgICAgICBBU1NFUlQobV9yZWFzb25Gb3JTdXNwZW5kaW5nQWN0aXZlRE9NT2JqZWN0 cyA9PSBSZWFzb25Gb3JTdXNwZW5zaW9uOjpQYWdlV2lsbEJlU3VzcGVuZGVkKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIApAQCAtMjkxLDcgKzI5MSw3IEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9u Q29udGV4dDo6c3VzcGVuZEFjdGkKICAgICBtX3JlYXNvbkZvclN1c3BlbmRpbmdBY3RpdmVET01P YmplY3RzID0gd2h5OwogfQogCi12b2lkIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnJlc3VtZUFj dGl2ZURPTU9iamVjdHMoQWN0aXZlRE9NT2JqZWN0OjpSZWFzb25Gb3JTdXNwZW5zaW9uIHdoeSkK K3ZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6cmVzdW1lQWN0aXZlRE9NT2JqZWN0cyhSZWFz b25Gb3JTdXNwZW5zaW9uIHdoeSkKIHsKICAgICBjaGVja0NvbnNpc3RlbmN5KCk7CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaAkocmV2aXNpb24g MjMzNTg1KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaAko d29ya2luZyBjb3B5KQpAQCAtMTMyLDggKzEzMiw4IEBAIHB1YmxpYzoKIAogICAgIC8vIEFjdGl2 ZSBvYmplY3RzIGNhbiBiZSBhc2tlZCB0byBzdXNwZW5kIGV2ZW4gaWYgY2FuU3VzcGVuZEFjdGl2 ZURPTU9iamVjdHNGb3JEb2N1bWVudFN1c3BlbnNpb24oKSByZXR1cm5zICdmYWxzZScgLQogICAg IC8vIHN0ZXAtYnktc3RlcCBKUyBkZWJ1Z2dpbmcgaXMgb25lIGV4YW1wbGUuCi0gICAgdmlydHVh bCB2b2lkIHN1c3BlbmRBY3RpdmVET01PYmplY3RzKEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9y U3VzcGVuc2lvbik7Ci0gICAgdmlydHVhbCB2b2lkIHJlc3VtZUFjdGl2ZURPTU9iamVjdHMoQWN0 aXZlRE9NT2JqZWN0OjpSZWFzb25Gb3JTdXNwZW5zaW9uKTsKKyAgICB2aXJ0dWFsIHZvaWQgc3Vz cGVuZEFjdGl2ZURPTU9iamVjdHMoUmVhc29uRm9yU3VzcGVuc2lvbik7CisgICAgdmlydHVhbCB2 b2lkIHJlc3VtZUFjdGl2ZURPTU9iamVjdHMoUmVhc29uRm9yU3VzcGVuc2lvbik7CiAgICAgdmly dHVhbCB2b2lkIHN0b3BBY3RpdmVET01PYmplY3RzKCk7CiAKICAgICBib29sIGFjdGl2ZURPTU9i amVjdHNBcmVTdXNwZW5kZWQoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2ZURPTU9iamVjdHNBcmVT dXNwZW5kZWQ7IH0KQEAgLTI3OSw3ICsyNzksNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIH0KICAg ICB9OwogCi0gICAgQWN0aXZlRE9NT2JqZWN0OjpSZWFzb25Gb3JTdXNwZW5zaW9uIHJlYXNvbkZv clN1c3BlbmRpbmdBY3RpdmVET01PYmplY3RzKCkgY29uc3QgeyByZXR1cm4gbV9yZWFzb25Gb3JT dXNwZW5kaW5nQWN0aXZlRE9NT2JqZWN0czsgfQorICAgIFJlYXNvbkZvclN1c3BlbnNpb24gcmVh c29uRm9yU3VzcGVuZGluZ0FjdGl2ZURPTU9iamVjdHMoKSBjb25zdCB7IHJldHVybiBtX3JlYXNv bkZvclN1c3BlbmRpbmdBY3RpdmVET01PYmplY3RzOyB9CiAKICAgICBib29sIGhhc1BlbmRpbmdB Y3Rpdml0eSgpIGNvbnN0OwogICAgIHZvaWQgcmVtb3ZlRnJvbUNvbnRleHRzTWFwKCk7CkBAIC0z MDgsNyArMzA4LDcgQEAgcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPHN0ZDo6 dW5pcXVlX3B0cjxQZW5kaW5nRXhjZXB0aW9uPj4+IG1fcGVuZGluZ0V4Y2VwdGlvbnM7CiAgICAg c3RkOjp1bmlxdWVfcHRyPFJlamVjdGVkUHJvbWlzZVRyYWNrZXI+IG1fcmVqZWN0ZWRQcm9taXNl VHJhY2tlcjsKIAotICAgIEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbiBtX3Jl YXNvbkZvclN1c3BlbmRpbmdBY3RpdmVET01PYmplY3RzIHsgc3RhdGljX2Nhc3Q8QWN0aXZlRE9N T2JqZWN0OjpSZWFzb25Gb3JTdXNwZW5zaW9uPigtMSkgfTsKKyAgICBSZWFzb25Gb3JTdXNwZW5z aW9uIG1fcmVhc29uRm9yU3VzcGVuZGluZ0FjdGl2ZURPTU9iamVjdHMgeyBzdGF0aWNfY2FzdDxS ZWFzb25Gb3JTdXNwZW5zaW9uPigtMSkgfTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxQdWJsaWNV UkxNYW5hZ2VyPiBtX3B1YmxpY1VSTE1hbmFnZXI7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2hp c3RvcnkvQ2FjaGVkRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2hpc3Rv cnkvQ2FjaGVkRnJhbWUuY3BwCShyZXZpc2lvbiAyMzM1ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0NhY2hlZEZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDcgKzEwMyw3IEBA IHZvaWQgQ2FjaGVkRnJhbWVCYXNlOjpyZXN0b3JlKCkKICAgICBlbHNlCiAgICAgICAgIGZyYW1l LmFuaW1hdGlvbigpLnJlc3VtZUFuaW1hdGlvbnNGb3JEb2N1bWVudChtX2RvY3VtZW50LmdldCgp KTsKIAotICAgIG1fZG9jdW1lbnQtPnJlc3VtZShBY3RpdmVET01PYmplY3Q6OlBhZ2VDYWNoZSk7 CisgICAgbV9kb2N1bWVudC0+cmVzdW1lKFJlYXNvbkZvclN1c3BlbnNpb246OlBhZ2VDYWNoZSk7 CiAKICAgICAvLyBJdCBpcyBuZWNlc3NhcnkgdG8gdXBkYXRlIGFueSBwbGF0Zm9ybSBzY3JpcHQg b2JqZWN0cyBhZnRlciByZXN0b3JpbmcgdGhlCiAgICAgLy8gY2FjaGVkIHBhZ2UuCkBAIC0xNTMs NyArMTUzLDcgQEAgQ2FjaGVkRnJhbWU6OkNhY2hlZEZyYW1lKEZyYW1lJiBmcmFtZSkKICAgICAg ICAgbV9jaGlsZEZyYW1lcy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxDYWNoZWRGcmFtZT4oKmNo aWxkKSk7CiAKICAgICAvLyBBY3RpdmUgRE9NIG9iamVjdHMgbXVzdCBiZSBzdXNwZW5kZWQgYmVm b3JlIHdlIGNhY2hlIHRoZSBmcmFtZSBzY3JpcHQgZGF0YS4KLSAgICBtX2RvY3VtZW50LT5zdXNw ZW5kKEFjdGl2ZURPTU9iamVjdDo6UGFnZUNhY2hlKTsKKyAgICBtX2RvY3VtZW50LT5zdXNwZW5k KFJlYXNvbkZvclN1c3BlbnNpb246OlBhZ2VDYWNoZSk7CiAKICAgICBtX2NhY2hlZEZyYW1lU2Ny aXB0RGF0YSA9IHN0ZDo6bWFrZV91bmlxdWU8U2NyaXB0Q2FjaGVkRnJhbWVEYXRhPihmcmFtZSk7 CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNp b24gMjMzNTg1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTYxNSwyOSArNTYxNSwyOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1l bnQ6OnN0b3AoKQogICAgIG1fbWVkaWFTZXNzaW9uLT5zdG9wU2Vzc2lvbigpOwogfQogCi12b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCit2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lvbiByZWFzb24pCiB7 CiAgICAgSU5GT19MT0coTE9HSURFTlRJRklFUik7CiAgICAgUmVmPEhUTUxNZWRpYUVsZW1lbnQ+ IHByb3RlY3RlZFRoaXMoKnRoaXMpOwogCi0gICAgc3dpdGNoICh3aHkpCi0gICAgewotICAgICAg ICBjYXNlIFBhZ2VDYWNoZToKLSAgICAgICAgICAgIHN0b3BXaXRob3V0RGVzdHJveWluZ01lZGlh UGxheWVyKCk7Ci0gICAgICAgICAgICBtX2FzeW5jRXZlbnRRdWV1ZS5zdXNwZW5kKCk7Ci0gICAg ICAgICAgICBzZXRTaG91bGRCdWZmZXJEYXRhKGZhbHNlKTsKLSAgICAgICAgICAgIG1fbWVkaWFT ZXNzaW9uLT5hZGRCZWhhdmlvclJlc3RyaWN0aW9uKE1lZGlhRWxlbWVudFNlc3Npb246OlJlcXVp cmVQYWdlQ29uc2VudFRvUmVzdW1lTWVkaWEpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGNhc2UgUGFnZVdpbGxCZVN1c3BlbmRlZDoKLSAgICAgICAgICAgIGlmICghbV9wYXVzZWRJbnRl cm5hbCkgewotICAgICAgICAgICAgICAgIG1fc2hvdWxkVW5wYXVzZUludGVybmFsT25SZXN1bWUg PSB0cnVlOwotICAgICAgICAgICAgICAgIHNldFBhdXNlZEludGVybmFsKHRydWUpOwotICAgICAg ICAgICAgfQotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgSmF2YVNjcmlwdERlYnVn Z2VyUGF1c2VkOgotICAgICAgICBjYXNlIFdpbGxEZWZlckxvYWRpbmc6Ci0gICAgICAgICAgICAv LyBEbyBub3RoaW5nLCB3ZSBkb24ndCBwYXVzZSBtZWRpYSBwbGF5YmFjayBpbiB0aGVzZSBjYXNl cy4KLSAgICAgICAgICAgIGJyZWFrOworICAgIHN3aXRjaCAocmVhc29uKSB7CisgICAgY2FzZSBS ZWFzb25Gb3JTdXNwZW5zaW9uOjpQYWdlQ2FjaGU6CisgICAgICAgIHN0b3BXaXRob3V0RGVzdHJv eWluZ01lZGlhUGxheWVyKCk7CisgICAgICAgIG1fYXN5bmNFdmVudFF1ZXVlLnN1c3BlbmQoKTsK KyAgICAgICAgc2V0U2hvdWxkQnVmZmVyRGF0YShmYWxzZSk7CisgICAgICAgIG1fbWVkaWFTZXNz aW9uLT5hZGRCZWhhdmlvclJlc3RyaWN0aW9uKE1lZGlhRWxlbWVudFNlc3Npb246OlJlcXVpcmVQ YWdlQ29uc2VudFRvUmVzdW1lTWVkaWEpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFJlYXNv bkZvclN1c3BlbnNpb246OlBhZ2VXaWxsQmVTdXNwZW5kZWQ6CisgICAgICAgIGlmICghbV9wYXVz ZWRJbnRlcm5hbCkgeworICAgICAgICAgICAgbV9zaG91bGRVbnBhdXNlSW50ZXJuYWxPblJlc3Vt ZSA9IHRydWU7CisgICAgICAgICAgICBzZXRQYXVzZWRJbnRlcm5hbCh0cnVlKTsKKyAgICAgICAg fQorICAgICAgICBicmVhazsKKyAgICBjYXNlIFJlYXNvbkZvclN1c3BlbnNpb246OkphdmFTY3Jp cHREZWJ1Z2dlclBhdXNlZDoKKyAgICBjYXNlIFJlYXNvbkZvclN1c3BlbnNpb246OldpbGxEZWZl ckxvYWRpbmc6CisgICAgICAgIC8vIERvIG5vdGhpbmcsIHdlIGRvbid0IHBhdXNlIG1lZGlhIHBs YXliYWNrIGluIHRoZXNlIGNhc2VzLgorICAgICAgICBicmVhazsKICAgICB9CiB9CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzM1 ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTMzLDkgKzEzMywxMCBAQCBib29sIEhUTUxTb3VyY2VFbGVtZW50OjpjYW5T dXNwZW5kRm9yRG9jCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgSFRNTFNvdXJjZUVsZW1l bnQ6OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCit2b2lkIEhUTUxTb3VyY2VFbGVt ZW50OjpzdXNwZW5kKFJlYXNvbkZvclN1c3BlbnNpb24gcmVhc29uKQogewotICAgIGlmICh3aHkg PT0gUGFnZUNhY2hlKSB7CisgICAgLy8gRklYTUU6IFNob3VsZG4ndCB0aGlzIGFsc28gc3RvcCB0 aGUgdGltZXIgZm9yIFBhZ2VXaWxsQmVTdXNwZW5kZWQ/CisgICAgaWYgKHJlYXNvbiA9PSBSZWFz b25Gb3JTdXNwZW5zaW9uOjpQYWdlQ2FjaGUpIHsKICAgICAgICAgbV9zaG91bGRSZXNjaGVkdWxl RXJyb3JFdmVudE9uUmVzdW1lID0gbV9lcnJvckV2ZW50VGltZXIuaXNBY3RpdmUoKTsKICAgICAg ICAgbV9lcnJvckV2ZW50VGltZXIuc3RvcCgpOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9QYWdlU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9QYWdlU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCShyZXZpc2lvbiAy MzM1ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZVNjcmlwdERlYnVnU2VydmVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYzLDkgKzE2Myw5IEBAIHZvaWQgUGFnZVNjcmlwdERl YnVnU2VydmVyOjpzZXRKYXZhU2NyaXAKICAgICBhdXRvJiBkb2N1bWVudCA9ICpmcmFtZS5kb2N1 bWVudCgpOwogICAgIGlmIChwYXVzZWQpIHsKICAgICAgICAgZG9jdW1lbnQuc3VzcGVuZFNjcmlw dGVkQW5pbWF0aW9uQ29udHJvbGxlckNhbGxiYWNrcygpOwotICAgICAgICBkb2N1bWVudC5zdXNw ZW5kQWN0aXZlRE9NT2JqZWN0cyhBY3RpdmVET01PYmplY3Q6OkphdmFTY3JpcHREZWJ1Z2dlclBh dXNlZCk7CisgICAgICAgIGRvY3VtZW50LnN1c3BlbmRBY3RpdmVET01PYmplY3RzKFJlYXNvbkZv clN1c3BlbnNpb246OkphdmFTY3JpcHREZWJ1Z2dlclBhdXNlZCk7CiAgICAgfSBlbHNlIHsKLSAg ICAgICAgZG9jdW1lbnQucmVzdW1lQWN0aXZlRE9NT2JqZWN0cyhBY3RpdmVET01PYmplY3Q6Okph dmFTY3JpcHREZWJ1Z2dlclBhdXNlZCk7CisgICAgICAgIGRvY3VtZW50LnJlc3VtZUFjdGl2ZURP TU9iamVjdHMoUmVhc29uRm9yU3VzcGVuc2lvbjo6SmF2YVNjcmlwdERlYnVnZ2VyUGF1c2VkKTsK ICAgICAgICAgZG9jdW1lbnQucmVzdW1lU2NyaXB0ZWRBbmltYXRpb25Db250cm9sbGVyQ2FsbGJh Y2tzKCk7CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJ KHJldmlzaW9uIDIzMzU4NSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMTgsNyArMjAxOCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6 OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgKICAgICAgICAgLy8gTm90ZSwgZGlkUmVjZWl2ZURvY1R5 cGUgaXMgZXhwZWN0ZWQgdG8gYmUgY2FsbGVkIGZvciBjYWNoZWQgcGFnZXMuIFNlZSA8cmRhcjov L3Byb2JsZW0vNTkwNjc1OD4gZm9yIG1vcmUgZGV0YWlscy4KICAgICAgICAgaWYgKGF1dG8qIHBh Z2UgPSBtX2ZyYW1lLnBhZ2UoKSkKICAgICAgICAgICAgIHBhZ2UtPmNocm9tZSgpLmRpZFJlY2Vp dmVEb2NUeXBlKG1fZnJhbWUpOwotICAgICAgICBtX2ZyYW1lLmRvY3VtZW50KCktPnJlc3VtZShB Y3RpdmVET01PYmplY3Q6OlBhZ2VDYWNoZSk7CisgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+ cmVzdW1lKFJlYXNvbkZvclN1c3BlbnNpb246OlBhZ2VDYWNoZSk7CiAKICAgICAgICAgLy8gRm9y Y2UgYSBsYXlvdXQgdG8gdXBkYXRlIHZpZXcgc2l6ZSBhbmQgdGhlcmVieSB1cGRhdGUgc2Nyb2xs YmFycy4KICNpZiBQTEFURk9STShJT1MpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNp b24gMjMzNTg1KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEwNTAsNyArMTA1MCw3IEBAIHZvaWQgRnJhbWU6OnN1c3BlbmRBY3RpdmVET01PYmpl Y3RzQW5kQW4KICAgICAvLyBGSVhNRTogU3VzcGVuZC9yZXN1bWUgY2FsbHMgd2lsbCBub3QgbWF0 Y2ggaWYgdGhlIGZyYW1lIGlzIG5hdmlnYXRlZCwgYW5kIGdldHMgYSBuZXcgZG9jdW1lbnQuCiAg ICAgY2xlYXJUaW1lcnMoKTsgLy8gU3VzcGVuZHMgYW5pbWF0aW9ucyBhbmQgcGVuZGluZyByZWxh eW91dHMuCiAgICAgaWYgKG1fZG9jKQotICAgICAgICBtX2RvYy0+c3VzcGVuZFNjaGVkdWxlZFRh c2tzKEFjdGl2ZURPTU9iamVjdDo6UGFnZVdpbGxCZVN1c3BlbmRlZCk7CisgICAgICAgIG1fZG9j LT5zdXNwZW5kU2NoZWR1bGVkVGFza3MoUmVhc29uRm9yU3VzcGVuc2lvbjo6UGFnZVdpbGxCZVN1 c3BlbmRlZCk7CiB9CiAKIHZvaWQgRnJhbWU6OnJlc3VtZUFjdGl2ZURPTU9iamVjdHNBbmRBbmlt YXRpb25zKCkKQEAgLTEwNjcsNyArMTA2Nyw3IEBAIHZvaWQgRnJhbWU6OnJlc3VtZUFjdGl2ZURP TU9iamVjdHNBbmRBbmkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IFN1c3BlbmQv cmVzdW1lIGNhbGxzIHdpbGwgbm90IG1hdGNoIGlmIHRoZSBmcmFtZSBpcyBuYXZpZ2F0ZWQsIGFu ZCBnZXRzIGEgbmV3IGRvY3VtZW50LgotICAgIG1fZG9jLT5yZXN1bWVTY2hlZHVsZWRUYXNrcyhB Y3RpdmVET01PYmplY3Q6OlBhZ2VXaWxsQmVTdXNwZW5kZWQpOworICAgIG1fZG9jLT5yZXN1bWVT Y2hlZHVsZWRUYXNrcyhSZWFzb25Gb3JTdXNwZW5zaW9uOjpQYWdlV2lsbEJlU3VzcGVuZGVkKTsK IAogICAgIC8vIEZyYW1lOjpjbGVhclRpbWVycygpIHN1c3BlbmRlZCBhbmltYXRpb25zIGFuZCBw ZW5kaW5nIHJlbGF5b3V0cy4KICAgICBhbmltYXRpb24oKS5yZXN1bWVBbmltYXRpb25zRm9yRG9j dW1lbnQobV9kb2MuZ2V0KCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXBM b2FkRGVmZXJyZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdy b3VwTG9hZERlZmVycmVyLmNwcAkocmV2aXNpb24gMjMzNTg1KQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlR3JvdXBMb2FkRGVmZXJyZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MCw3ICs0 MCw3IEBAIFBhZ2VHcm91cExvYWREZWZlcnJlcjo6UGFnZUdyb3VwTG9hZERlZmUKICAgICAgICAg ICAgICAgICAvLyBUaGlzIGNvZGUgaXMgbm90IGxvZ2ljYWxseSBwYXJ0IG9mIGxvYWQgZGVmZXJy aW5nLCBidXQgd2UgZG8gbm90IHdhbnQgSlMgY29kZSBleGVjdXRlZCBiZW5lYXRoIG1vZGFsCiAg ICAgICAgICAgICAgICAgLy8gd2luZG93cyBvciBzaGVldHMsIHdoaWNoIGlzIGV4YWN0bHkgd2hl biBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgaXMgdXNlZC4KICAgICAgICAgICAgICAgICBmb3IgKEZy YW1lKiBmcmFtZSA9ICZvdGhlclBhZ2UtPm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFt ZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKQotICAgICAgICAgICAgICAgICAgICBmcmFtZS0+ZG9j dW1lbnQoKS0+c3VzcGVuZFNjaGVkdWxlZFRhc2tzKEFjdGl2ZURPTU9iamVjdDo6V2lsbERlZmVy TG9hZGluZyk7CisgICAgICAgICAgICAgICAgICAgIGZyYW1lLT5kb2N1bWVudCgpLT5zdXNwZW5k U2NoZWR1bGVkVGFza3MoUmVhc29uRm9yU3VzcGVuc2lvbjo6V2lsbERlZmVyTG9hZGluZyk7CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC01OCw3ICs1OCw3IEBAIFBhZ2VHcm91 cExvYWREZWZlcnJlcjo6flBhZ2VHcm91cExvYWREZWYKICAgICAgICAgICAgIHBhZ2UtPnNldERl ZmVyc0xvYWRpbmcoZmFsc2UpOwogCiAgICAgICAgICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZw YWdlLT5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5l eHQoKSkKLSAgICAgICAgICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+cmVzdW1lU2NoZWR1bGVk VGFza3MoQWN0aXZlRE9NT2JqZWN0OjpXaWxsRGVmZXJMb2FkaW5nKTsKKyAgICAgICAgICAgICAg ICBmcmFtZS0+ZG9jdW1lbnQoKS0+cmVzdW1lU2NoZWR1bGVkVGFza3MoUmVhc29uRm9yU3VzcGVu c2lvbjo6V2lsbERlZmVyTG9hZGluZyk7CiAgICAgICAgIH0KICAgICB9CiB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAJKHJldmlzaW9uIDIzMzU4NSkKKysrIFNvdXJj ZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMTUs NyArMTExNSw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OnN1c3BlbmQoUmVhc29uRm9yU3UKICAg ICAgICAgbV9kaXNwYXRjaEVycm9yT25SZXN1bWluZyA9IHRydWU7CiAgICAgfQogCi0gICAgaWYg KHJlYXNvbiA9PSBBY3RpdmVET01PYmplY3Q6OlBhZ2VDYWNoZSAmJiBtX2xvYWRlcikgeworICAg IGlmIChyZWFzb24gPT0gUmVhc29uRm9yU3VzcGVuc2lvbjo6UGFnZUNhY2hlICYmIG1fbG9hZGVy KSB7CiAgICAgICAgIC8vIEdvaW5nIGludG8gUGFnZUNhY2hlLCBhYm9ydCB0aGUgcmVxdWVzdCBh bmQgZGlzcGF0Y2ggYSBuZXR3b3JrIGVycm9yIG9uIHJlc3VtaW5nLgogICAgICAgICBnZW5lcmlj RXJyb3IoKTsKICAgICAgICAgbV9kaXNwYXRjaEVycm9yT25SZXN1bWluZyA9IHRydWU7Cg==