56963 2011-03-23 15:00:10 -0700 REGRESSION(r81802): Broke a layout test, and this fix is not trivial. (Requested by dhyatt on #webkit). 2011-03-23 15:39:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 56909 1 webkit.review.bot webkit.review.bot commit-queue hyatt mitz oldest_to_newest 372459 0 webkit.review.bot 2011-03-23 15:00:10 -0700 http://trac.webkit.org/changeset/81802 broke the build: Broke a layout test, and this fix is not trivial. (Requested by dhyatt on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 372460 1 86698 webkit.review.bot 2011-03-23 15:00:34 -0700 Created attachment 86698 ROLLOUT of r81802 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 372461 2 86698 hyatt 2011-03-23 15:01:30 -0700 Comment on attachment 86698 ROLLOUT of r81802 Roll out 81802. 372502 3 hyatt 2011-03-23 15:39:29 -0700 Rolled out manually in 81816. 86698 2011-03-23 15:00:34 -0700 2011-03-23 15:36:03 -0700 ROLLOUT of r81802 bug-56963-20110323215832.patch text/plain 23130 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogODE4MDgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkNTAzNjVmNWJhMjg4Mzc4 MzA0Y2QyNDM4M2NhZTUzY2M3ODg2OTI4Li44ZjI0NGNkYWRhMjZjZGE2ZDMzYzA4MGRjOTdmMmZj MmYxMDE0ZWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTEtMDMtMjMgIFNoZXJp ZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHI4MTgwMi4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvODE4MDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU2OTYzCisKKyAgICAgICAgQnJva2UgYSBsYXlvdXQgdGVzdCwgYW5kIHRoaXMgZml4 IGlzIG5vdCB0cml2aWFsLiAoUmVxdWVzdGVkCisgICAgICAgIGJ5IGRoeWF0dCBvbiAjd2Via2l0 KS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy QmxvY2s6OmxheW91dE9ubHlQb3NpdGlvbmVkT2JqZWN0cyk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94TW9kZWxPYmplY3Q6OnN0eWxlV2lsbENoYW5nZSk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94 OjpsYXlvdXRCbG9jayk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OlJlbmRlck9iamVjdCk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmFkanVzdFN0eWxlRGlmZmVyZW5jZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnNldFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck9iamVjdDo6c3R5bGVEaWRDaGFuZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmpl Y3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6bmVlZHNMYXlvdXQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpuZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91 dE9ubHkpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpzZXROZWVkc0xheW91dCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnNldENoaWxkTmVlZHNMYXlvdXQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjptYXJrQ29udGFpbmluZ0Jsb2Nrc0Zvckxh eW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRhYmxlOjpsYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6ZGlmZik6Cisg ICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6CisgICAgICAg ICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclNWR1RleHQ6OmxheW91dCk6CisKIDIwMTEtMDMtMjMgIFhpYW9tZWkgSmkgIDx4amlAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggODA4MzkxMGJmMTliMmRjNGZiZDgy YWIwZmI4MjQ0NmQyOWQzYTc1Ny4uMWE4MjRkZWM5YWQ5MTM2MDU4ODcwNzM5N2MyYWU4NGNkNDNk YjY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0zNCw3 ICszNCw2IEBACiAjaW5jbHVkZSAiSFRNTEZvcm1FbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5h bWVzLmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgotI2luY2x1ZGUgIklubGluZUl0ZXJh dG9yLmgiCiAjaW5jbHVkZSAiSW5saW5lVGV4dEJveC5oIgogI2luY2x1ZGUgIlBhaW50SW5mby5o IgogI2luY2x1ZGUgIlJlbmRlckNvbWJpbmVUZXh0LmgiCkBAIC0xMTMxLDcgKzExMzAsNyBAQCB2 b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIGludCBw YWdlTG9naWNhbEhlaWdodCkKICAgICBpZiAoaXNJbmxpbmUoKSAmJiAhaXNJbmxpbmVCbG9ja09y SW5saW5lVGFibGUoKSkgLy8gSW5saW5lIDxmb3JtPnMgaW5zaWRlIHZhcmlvdXMgdGFibGUgZWxl bWVudHMgY2FuCiAgICAgICAgIHJldHVybjsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIGNhdXNlIHVzIHRvIGNvbWUgaW4gaGVyZS4gIEp1c3QgYmFpbC4KIAotICAgIGlm ICghcmVsYXlvdXRDaGlsZHJlbiAmJiBzaW1wbGlmaWVkTGF5b3V0KCkpCisgICAgaWYgKCFyZWxh eW91dENoaWxkcmVuICYmIGxheW91dE9ubHlQb3NpdGlvbmVkT2JqZWN0cygpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBMYXlvdXRSZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBtX2V2ZXJIYWRM YXlvdXQgJiYgY2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpOwpAQCAtMjA3NSw1OCArMjA3 NCwyMSBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRCbG9ja0NoaWxkKFJlbmRlckJveCogY2hp bGQsIE1hcmdpbkluZm8mIG1hcmdpbkluZm8sIGludAogICAgIEFTU0VSVChvbGRMYXlvdXREZWx0 YSA9PSB2aWV3KCktPmxheW91dERlbHRhKCkpOwogfQogCi12b2lkIFJlbmRlckJsb2NrOjpzaW1w bGlmaWVkTm9ybWFsRmxvd0xheW91dCgpCitib29sIFJlbmRlckJsb2NrOjpsYXlvdXRPbmx5UG9z aXRpb25lZE9iamVjdHMoKQogewotICAgIGlmIChjaGlsZHJlbklubGluZSgpKSB7Ci0gICAgICAg IExpc3RIYXNoU2V0PFJvb3RJbmxpbmVCb3gqPiBsaW5lQm94ZXM7Ci0gICAgICAgIGJvb2wgZW5k T2ZJbmxpbmUgPSBmYWxzZTsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiBvID0gYmlkaUZpcnN0KHRo aXMsIDAsIGZhbHNlKTsKLSAgICAgICAgd2hpbGUgKG8pIHsKLSAgICAgICAgICAgIGlmICghby0+ aXNQb3NpdGlvbmVkKCkgJiYgKG8tPmlzUmVwbGFjZWQoKSB8fCBvLT5pc0Zsb2F0aW5nKCkpKSB7 Ci0gICAgICAgICAgICAgICAgby0+bGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAgICAgICAgICBp ZiAodG9SZW5kZXJCb3gobyktPmlubGluZUJveFdyYXBwZXIoKSkgewotICAgICAgICAgICAgICAg ICAgICBSb290SW5saW5lQm94KiBib3ggPSB0b1JlbmRlckJveChvKS0+aW5saW5lQm94V3JhcHBl cigpLT5yb290KCk7Ci0gICAgICAgICAgICAgICAgICAgIGxpbmVCb3hlcy5hZGQoYm94KTsKLSAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKG8tPmlzVGV4dCgpIHx8IChv LT5pc1JlbmRlcklubGluZSgpICYmICFlbmRPZklubGluZSkpCi0gICAgICAgICAgICAgICAgby0+ c2V0TmVlZHNMYXlvdXQoZmFsc2UpOwotICAgICAgICAgICAgbyA9IGJpZGlOZXh0KHRoaXMsIG8s IDAsIGZhbHNlLCAmZW5kT2ZJbmxpbmUpOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gRklYTUU6 IEdseXBoIG92ZXJmbG93IHdpbGwgZ2V0IGxvc3QgaW4gdGhpcyBjYXNlLCBidXQgbm90IHJlYWxs eSBhIGJpZyBkZWFsLgotICAgICAgICBHbHlwaE92ZXJmbG93QW5kRmFsbGJhY2tGb250c01hcCB0 ZXh0Qm94RGF0YU1hcDsgICAgICAgICAgICAgICAgICAKLSAgICAgICAgZm9yIChMaXN0SGFzaFNl dDxSb290SW5saW5lQm94Kj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbGluZUJveGVzLmJlZ2luKCk7 IGl0ICE9IGxpbmVCb3hlcy5lbmQoKTsgKytpdCkgewotICAgICAgICAgICAgUm9vdElubGluZUJv eCogYm94ID0gKml0OwotICAgICAgICAgICAgYm94LT5jb21wdXRlT3ZlcmZsb3coYm94LT5saW5l VG9wKCksIGJveC0+bGluZUJvdHRvbSgpLCBkb2N1bWVudCgpLT5pbk5vUXVpcmtzTW9kZSgpLCB0 ZXh0Qm94RGF0YU1hcCk7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAgICBmb3IgKFJl bmRlckJveCogYm94ID0gZmlyc3RDaGlsZEJveCgpOyBib3g7IGJveCA9IGJveC0+bmV4dFNpYmxp bmdCb3goKSkgewotICAgICAgICAgICAgaWYgKCFib3gtPmlzUG9zaXRpb25lZCgpKQotICAgICAg ICAgICAgICAgIGJveC0+bGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAgfQotICAgIH0KLX0KLQot Ym9vbCBSZW5kZXJCbG9jazo6c2ltcGxpZmllZExheW91dCgpCi17Ci0gICAgaWYgKCghcG9zQ2hp bGROZWVkc0xheW91dCgpICYmICFuZWVkc1NpbXBsaWZpZWROb3JtYWxGbG93TGF5b3V0KCkpIHx8 IG5vcm1hbENoaWxkTmVlZHNMYXlvdXQoKSB8fCBzZWxmTmVlZHNMYXlvdXQoKSkKKyAgICBpZiAo IXBvc0NoaWxkTmVlZHNMYXlvdXQoKSB8fCBub3JtYWxDaGlsZE5lZWRzTGF5b3V0KCkgfHwgc2Vs Zk5lZWRzTGF5b3V0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIExheW91dFN0YXRl TWFpbnRhaW5lciBzdGF0ZVB1c2hlcih2aWV3KCksIHRoaXMsIEludFNpemUoeCgpLCB5KCkpLCBo YXNDb2x1bW5zKCkgfHwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxl KCktPmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOwotICAgIAorCiAgICAgaWYgKG5lZWRz UG9zaXRpb25lZE1vdmVtZW50TGF5b3V0KCkpIHsKICAgICAgICAgdHJ5TGF5b3V0RG9pbmdQb3Np dGlvbmVkTW92ZW1lbnRPbmx5KCk7CiAgICAgICAgIGlmIChuZWVkc0xheW91dCgpKQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIC8vIExheSBvdXQgcG9zaXRpb25lZCBk ZXNjZW5kYW50cyBvciBvYmplY3RzIHRoYXQganVzdCBuZWVkIHRvIHJlY29tcHV0ZSBvdmVyZmxv dy4KLSAgICBpZiAobmVlZHNTaW1wbGlmaWVkTm9ybWFsRmxvd0xheW91dCgpKQotICAgICAgICBz aW1wbGlmaWVkTm9ybWFsRmxvd0xheW91dCgpOwotCi0gICAgLy8gTGF5IG91dCBvdXIgcG9zaXRp b25lZCBvYmplY3RzIGlmIG91ciBwb3NpdGlvbmVkIGNoaWxkIGJpdCBpcyBzZXQuCi0gICAgaWYg KHBvc0NoaWxkTmVlZHNMYXlvdXQoKSkKLSAgICAgICAgbGF5b3V0UG9zaXRpb25lZE9iamVjdHMo ZmFsc2UpOworICAgIC8vIEFsbCB3ZSBoYXZlIHRvIGlzIGxheSBvdXQgb3VyIHBvc2l0aW9uZWQg b2JqZWN0cy4KKyAgICBsYXlvdXRQb3NpdGlvbmVkT2JqZWN0cyhmYWxzZSk7CiAKICAgICAvLyBS ZWNvbXB1dGUgb3VyIG92ZXJmbG93IGluZm9ybWF0aW9uLgogICAgIC8vIEZJWE1FOiBXZSBjb3Vs ZCBkbyBiZXR0ZXIgaGVyZSBieSBjb21wdXRpbmcgYSB0ZW1wb3Jhcnkgb3ZlcmZsb3cgb2JqZWN0 IGZyb20gbGF5b3V0UG9zaXRpb25lZE9iamVjdHMgYW5kIG9ubHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmgKaW5kZXggZTY4YTQxMmVlMTJmN2EwYzYxMzEyMWZjZTZmY2MzYTA1 NGU3ZDdlNi4uNWI5MWJjOWFhNWY5M2E2MjdjNzQ4ZmRhZmIwODdjZDMyZWFkMTg1ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTI5Nyw5ICsyOTcsNyBAQCBwcm90 ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSwg Y29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKTsKIAogICAgIHZpcnR1YWwgYm9vbCBoYXNMaW5l SWZFbXB0eSgpIGNvbnN0OwotICAgIAotICAgIGJvb2wgc2ltcGxpZmllZExheW91dCgpOwotICAg IHZvaWQgc2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQoKTsKKyAgICBib29sIGxheW91dE9ubHlQ b3NpdGlvbmVkT2JqZWN0cygpOwogCiAgICAgdm9pZCBjb21wdXRlT3ZlcmZsb3coaW50IG9sZENs aWVudEFmdGVyRWRnZSwgYm9vbCByZWNvbXB1dGVGbG9hdHMgPSBmYWxzZSk7CiAgICAgdmlydHVh bCB2b2lkIGFkZE92ZXJmbG93RnJvbUNoaWxkcmVuKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCmluZGV4IGUwMDU2ZWNiNmExYjNjZjkyNDY3MDAxMGQzNjQ0YTZlOGUxNGU1 NjIuLjkyMGQxOTMzMDZjMjViZjM1YWQ2NGExMjRjMTRiNzllODE5NWZlZjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yODgsMTcgKzI4OCw4IEBAIHZvaWQgUmVu ZGVyQm94OjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVy U3R5bGUqIG9sZFN0eWxlCiB7CiAgICAgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnN0eWxlRGlkQ2hh bmdlKGRpZmYsIG9sZFN0eWxlKTsKIAotICAgIGlmIChuZWVkc0xheW91dCgpICYmIG9sZFN0eWxl KSB7Ci0gICAgICAgIGlmIChvbGRTdHlsZSAmJiAob2xkU3R5bGUtPmxvZ2ljYWxIZWlnaHQoKS5p c1BlcmNlbnQoKSB8fCBvbGRTdHlsZS0+bG9naWNhbE1pbkhlaWdodCgpLmlzUGVyY2VudCgpIHx8 IG9sZFN0eWxlLT5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNQZXJjZW50KCkpKQotICAgICAgICAgICAg UmVuZGVyQmxvY2s6OnJlbW92ZVBlcmNlbnRIZWlnaHREZXNjZW5kYW50KHRoaXMpOwotCi0gICAg ICAgIC8vIE5vcm1hbGx5IHdlIGNhbiBkbyBvcHRpbWl6ZWQgcG9zaXRpb25pbmcgbGF5b3V0IGZv ciBhYnNvbHV0ZS9maXhlZCBwb3NpdGlvbmVkIG9iamVjdHMuIFRoZXJlIGlzIG9uZSBzcGVjaWFs IGNhc2UsIGhvd2V2ZXIsIHdoaWNoIGlzCi0gICAgICAgIC8vIHdoZW4gdGhlIHBvc2l0aW9uZWQg b2JqZWN0J3MgbWFyZ2luLWJlZm9yZSBpcyBjaGFuZ2VkLiBJbiB0aGlzIGNhc2UgdGhlIHBhcmVu dCBoYXMgdG8gZ2V0IGEgbGF5b3V0IGluIG9yZGVyIHRvIHJ1biBtYXJnaW4gY29sbGFwc2luZwot ICAgICAgICAvLyB0byBkZXRlcm1pbmUgdGhlIG5ldyBzdGF0aWMgcG9zaXRpb24uCi0gICAgICAg IGlmIChpc1Bvc2l0aW9uZWQoKSAmJiBzdHlsZSgpLT5oYXNTdGF0aWNCbG9ja1Bvc2l0aW9uKGlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpICYmIG9sZFN0eWxlLT5tYXJnaW5CZWZvcmUoKSAhPSBz dHlsZSgpLT5tYXJnaW5CZWZvcmUoKQotICAgICAgICAgICAgJiYgcGFyZW50KCkgJiYgIXBhcmVu dCgpLT5ub3JtYWxDaGlsZE5lZWRzTGF5b3V0KCkpCi0gICAgICAgICAgICBwYXJlbnQoKS0+c2V0 Q2hpbGROZWVkc0xheW91dCh0cnVlKTsKLSAgICB9CisgICAgaWYgKG5lZWRzTGF5b3V0KCkgJiYg b2xkU3R5bGUgJiYgKG9sZFN0eWxlLT5sb2dpY2FsSGVpZ2h0KCkuaXNQZXJjZW50KCkgfHwgb2xk U3R5bGUtPmxvZ2ljYWxNaW5IZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBvbGRTdHlsZS0+bG9naWNh bE1heEhlaWdodCgpLmlzUGVyY2VudCgpKSkKKyAgICAgICAgUmVuZGVyQmxvY2s6OnJlbW92ZVBl cmNlbnRIZWlnaHREZXNjZW5kYW50KHRoaXMpOwogCiAgICAgLy8gSWYgb3VyIHpvb20gZmFjdG9y IGNoYW5nZXMgYW5kIHdlIGhhdmUgYSBkZWZpbmVkIHNjcm9sbExlZnQvVG9wLCB3ZSBuZWVkIHRv IGFkanVzdCB0aGF0IHZhbHVlIGludG8gdGhlCiAgICAgLy8gbmV3IHpvb21lZCBjb29yZGluYXRl IHNwYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1v ZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5jcHAKaW5kZXggM2UyOTc0ZDRmOWM1OWFjNzlkY2FlZmIyOGFkNjQyZWViMDU0M2Y3NS4u NjVhOWY0NmE3YTczMjUzOGZjYWFhOWIwNDAyZTg4ZGY1ZjA1NjlkZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC0zMDMsNyAr MzAzLDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6c3R5bGVXaWxsQ2hhbmdlKFN0eWxl RGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHkKICAgICAgICAgICAgICAgICByZXBhaW50 KCk7CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIGlmIChkaWZmID09IFN0eWxlRGlmZmVy ZW5jZUxheW91dCB8fCBkaWZmID09IFN0eWxlRGlmZmVyZW5jZVNpbXBsaWZpZWRMYXlvdXQpIHsK KyAgICAgICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlTGF5b3V0KSB7CiAgICAgICAgICAg ICAvLyBXaGVuIGEgbGF5b3V0IGhpbnQgaGFwcGVucywgd2UgZ28gYWhlYWQgYW5kIGRvIGEgcmVw YWludCBvZiB0aGUgbGF5ZXIsIHNpbmNlIHRoZSBsYXllciBjb3VsZAogICAgICAgICAgICAgLy8g ZW5kIHVwIGJlaW5nIGRlc3Ryb3llZC4KICAgICAgICAgICAgIGlmIChoYXNMYXllcigpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBh Yjk1MGVmMjA0NGE0NzAzYjVlNmM2Yjk4YzM0NDQ0ODVmZTk5OGZkLi5jOTI4NTVmZWQ1ZmUxMjM1 MTM5MzkzZDUxOTI4ZThlYjY3MjA2MzZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTIwOSw3ICsyMDksNyBAQCB2b2lkIFJlbmRlckZs ZXhpYmxlQm94OjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIGludCAvKnBhZ2VI ZWlnaHQgRklYTQogewogICAgIEFTU0VSVChuZWVkc0xheW91dCgpKTsKIAotICAgIGlmICghcmVs YXlvdXRDaGlsZHJlbiAmJiBzaW1wbGlmaWVkTGF5b3V0KCkpCisgICAgaWYgKCFyZWxheW91dENo aWxkcmVuICYmIGxheW91dE9ubHlQb3NpdGlvbmVkT2JqZWN0cygpKQogICAgICAgICByZXR1cm47 CiAKICAgICBMYXlvdXRSZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBjaGVja0ZvclJlcGFpbnRE dXJpbmdMYXlvdXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3Bw CmluZGV4IDM1ZWZiMTJmNTlmYjhmMzdjN2ZhYmM4NjBiNGFhMzNhNDkyZTE3NzEuLmYyNWJmZTNj OWJkN2EzYjc3ZTc1YzE4N2E3NjhhMDBhNWRkYzEwNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xOTEsNyArMTkxLDYgQEAgUmVuZGVyT2JqZWN0OjpS ZW5kZXJPYmplY3QoTm9kZSogbm9kZSkKICAgICAsIG1fbmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRM YXlvdXQoZmFsc2UpCiAgICAgLCBtX25vcm1hbENoaWxkTmVlZHNMYXlvdXQoZmFsc2UpCiAgICAg LCBtX3Bvc0NoaWxkTmVlZHNMYXlvdXQoZmFsc2UpCi0gICAgLCBtX25lZWRzU2ltcGxpZmllZE5v cm1hbEZsb3dMYXlvdXQoZmFsc2UpCiAgICAgLCBtX3ByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0 eShmYWxzZSkKICAgICAsIG1fZmxvYXRpbmcoZmFsc2UpCiAgICAgLCBtX3Bvc2l0aW9uZWQoZmFs c2UpCkBAIC0xNjg3LDEyICsxNjg2LDkgQEAgU3R5bGVEaWZmZXJlbmNlIFJlbmRlck9iamVjdDo6 YWRqdXN0U3R5bGVEaWZmZXJlbmNlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCB1bnNpZ24KICAgICAg ICAgLy8gVGV4dCBub2RlcyBzaGFyZSBzdHlsZSB3aXRoIHRoZWlyIHBhcmVudHMgYnV0IHRyYW5z Zm9ybXMgZG9uJ3QgYXBwbHkgdG8gdGhlbSwKICAgICAgICAgLy8gaGVuY2UgdGhlICFpc1RleHQo KSBjaGVjay4KICAgICAgICAgLy8gRklYTUU6IHdoZW4gdHJhbnNmb3JtcyBhcmUgdGFrZW4gaW50 byBhY2NvdW50IGZvciBvdmVyZmxvdywgd2Ugd2lsbCBuZWVkIHRvIGRvIGEgbGF5b3V0LgotICAg ICAgICBpZiAoIWlzVGV4dCgpICYmICghaGFzTGF5ZXIoKSB8fCAhdG9SZW5kZXJCb3hNb2RlbE9i amVjdCh0aGlzKS0+bGF5ZXIoKS0+aXNDb21wb3NpdGVkKCkpKSB7Ci0gICAgICAgICAgICBpZiAo IWhhc0xheWVyKCkpCi0gICAgICAgICAgICAgICAgZGlmZiA9IFN0eWxlRGlmZmVyZW5jZUxheW91 dDsgLy8gRklYTUU6IERvIHRoaXMgZm9yIG5vdyBzaW5jZSBTaW1wbGlmaWVkTGF5b3V0IGNhbm5v dCBoYW5kbGUgdXBkYXRpbmcgZmxvYXRpbmcgb2JqZWN0cyBsaXN0cy4KLSAgICAgICAgICAgIGVs c2UgaWYgKGRpZmYgPCBTdHlsZURpZmZlcmVuY2VTaW1wbGlmaWVkTGF5b3V0KQotICAgICAgICAg ICAgICAgIGRpZmYgPSBTdHlsZURpZmZlcmVuY2VTaW1wbGlmaWVkTGF5b3V0OwotICAgICAgICB9 IGVsc2UgaWYgKGRpZmYgPCBTdHlsZURpZmZlcmVuY2VSZWNvbXBvc2l0ZUxheWVyKQorICAgICAg ICBpZiAoIWlzVGV4dCgpICYmICghaGFzTGF5ZXIoKSB8fCAhdG9SZW5kZXJCb3hNb2RlbE9iamVj dCh0aGlzKS0+bGF5ZXIoKS0+aXNDb21wb3NpdGVkKCkpKQorICAgICAgICAgICAgZGlmZiA9IFN0 eWxlRGlmZmVyZW5jZUxheW91dDsKKyAgICAgICAgZWxzZSBpZiAoZGlmZiA8IFN0eWxlRGlmZmVy ZW5jZVJlY29tcG9zaXRlTGF5ZXIpCiAgICAgICAgICAgICBkaWZmID0gU3R5bGVEaWZmZXJlbmNl UmVjb21wb3NpdGVMYXllcjsKICAgICB9CiAKQEAgLTE3NzEsOCArMTc2Nyw2IEBAIHZvaWQgUmVu ZGVyT2JqZWN0OjpzZXRTdHlsZShQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZSkKICAgICAg ICAgICAgIHNldE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOwogICAgICAgICBlbHNl IGlmICh1cGRhdGVkRGlmZiA9PSBTdHlsZURpZmZlcmVuY2VMYXlvdXRQb3NpdGlvbmVkTW92ZW1l bnRPbmx5KQogICAgICAgICAgICAgc2V0TmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXQoKTsK LSAgICAgICAgZWxzZSBpZiAodXBkYXRlZERpZmYgPT0gU3R5bGVEaWZmZXJlbmNlU2ltcGxpZmll ZExheW91dCkKLSAgICAgICAgICAgIHNldE5lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQo KTsKICAgICB9CiAgICAgCiAgICAgaWYgKHVwZGF0ZWREaWZmID09IFN0eWxlRGlmZmVyZW5jZVJl cGFpbnRMYXllciB8fCB1cGRhdGVkRGlmZiA9PSBTdHlsZURpZmZlcmVuY2VSZXBhaW50KSB7CkBA IC0xODg2LDcgKzE4ODAsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6c3R5bGVEaWRDaGFuZ2UoU3R5 bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdAogICAgIGlmICghbV9w YXJlbnQpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZl cmVuY2VMYXlvdXQgfHwgZGlmZiA9PSBTdHlsZURpZmZlcmVuY2VTaW1wbGlmaWVkTGF5b3V0KSB7 CisgICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlTGF5b3V0KSB7CiAgICAgICAgIFJlbmRl ckNvdW50ZXI6OnJlbmRlcmVyU3R5bGVDaGFuZ2VkKHRoaXMsIG9sZFN0eWxlLCBtX3N0eWxlLmdl dCgpKTsKIAogICAgICAgICAvLyBJZiB0aGUgb2JqZWN0IGFscmVhZHkgbmVlZHMgbGF5b3V0LCB0 aGVuIHNldE5lZWRzTGF5b3V0IHdvbid0IGRvCkBAIC0xODk3LDEwICsxODkxLDcgQEAgdm9pZCBS ZW5kZXJPYmplY3Q6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBS ZW5kZXJTdHlsZSogb2xkU3QKICAgICAgICAgaWYgKG1fbmVlZHNMYXlvdXQgJiYgb2xkU3R5bGUt PnBvc2l0aW9uKCkgIT0gbV9zdHlsZS0+cG9zaXRpb24oKSkKICAgICAgICAgICAgIG1hcmtDb250 YWluaW5nQmxvY2tzRm9yTGF5b3V0KCk7CiAKLSAgICAgICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZm ZXJlbmNlTGF5b3V0KQotICAgICAgICAgICAgc2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVj YWxjKCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNldE5lZWRzU2ltcGxpZmllZE5vcm1h bEZsb3dMYXlvdXQoKTsKKyAgICAgICAgc2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxj KCk7CiAgICAgfSBlbHNlIGlmIChkaWZmID09IFN0eWxlRGlmZmVyZW5jZUxheW91dFBvc2l0aW9u ZWRNb3ZlbWVudE9ubHkpCiAgICAgICAgIHNldE5lZWRzUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0 KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3Qu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAppbmRleCA0MTU2NGRk ZGRkZjBjZDJjNjYzZjY4YTMzODEzZTc0OTdkNDU0MmRhLi41YjEwZTFlNDljMGZhODgyMGY0YWIz MTk3YjEzMjNhNjBlNjZjYjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5oCkBAIC00MTUsMTIgKzQxNSwxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNCb3hEZWNvcmF0 aW9ucygpIGNvbnN0IHsgcmV0dXJuIG1fcGFpbnRCYWNrZ3JvdW5kOyB9CiAgICAgYm9vbCBtdXN0 UmVwYWludEJhY2tncm91bmRPckJvcmRlcigpIGNvbnN0OwogICAgIGJvb2wgaGFzQmFja2dyb3Vu ZCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmhhc0JhY2tncm91bmQoKTsgfQotICAgIGJvb2wg bmVlZHNMYXlvdXQoKSBjb25zdCB7IHJldHVybiBtX25lZWRzTGF5b3V0IHx8IG1fbm9ybWFsQ2hp bGROZWVkc0xheW91dCB8fCBtX3Bvc0NoaWxkTmVlZHNMYXlvdXQgfHwgbV9uZWVkc1NpbXBsaWZp ZWROb3JtYWxGbG93TGF5b3V0IHx8IG1fbmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXQ7IH0K KyAgICBib29sIG5lZWRzTGF5b3V0KCkgY29uc3QgeyByZXR1cm4gbV9uZWVkc0xheW91dCB8fCBt X25vcm1hbENoaWxkTmVlZHNMYXlvdXQgfHwgbV9wb3NDaGlsZE5lZWRzTGF5b3V0IHx8IG1fbmVl ZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXQ7IH0KICAgICBib29sIHNlbGZOZWVkc0xheW91dCgp IGNvbnN0IHsgcmV0dXJuIG1fbmVlZHNMYXlvdXQ7IH0KICAgICBib29sIG5lZWRzUG9zaXRpb25l ZE1vdmVtZW50TGF5b3V0KCkgY29uc3QgeyByZXR1cm4gbV9uZWVkc1Bvc2l0aW9uZWRNb3ZlbWVu dExheW91dDsgfQotICAgIGJvb2wgbmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXRPbmx5KCkg Y29uc3QgeyByZXR1cm4gbV9uZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91dCAmJiAhbV9uZWVk c0xheW91dCAmJiAhbV9ub3JtYWxDaGlsZE5lZWRzTGF5b3V0ICYmICFtX3Bvc0NoaWxkTmVlZHNM YXlvdXQgJiYgIW1fbmVlZHNTaW1wbGlmaWVkTm9ybWFsRmxvd0xheW91dDsgfQorICAgIGJvb2wg bmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXRPbmx5KCkgY29uc3QgeyByZXR1cm4gbV9uZWVk c1Bvc2l0aW9uZWRNb3ZlbWVudExheW91dCAmJiAhbV9uZWVkc0xheW91dCAmJiAhbV9ub3JtYWxD aGlsZE5lZWRzTGF5b3V0ICYmICFtX3Bvc0NoaWxkTmVlZHNMYXlvdXQ7IH0KICAgICBib29sIHBv c0NoaWxkTmVlZHNMYXlvdXQoKSBjb25zdCB7IHJldHVybiBtX3Bvc0NoaWxkTmVlZHNMYXlvdXQ7 IH0KLSAgICBib29sIG5lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQoKSBjb25zdCB7IHJl dHVybiBtX25lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQ7IH0KICAgICBib29sIG5vcm1h bENoaWxkTmVlZHNMYXlvdXQoKSBjb25zdCB7IHJldHVybiBtX25vcm1hbENoaWxkTmVlZHNMYXlv dXQ7IH0KICAgICAKICAgICBib29sIHByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5OyB9CkBAIC00ODksNyArNDg4 LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TmVlZHNMYXlvdXQoYm9vbCBiLCBib29sIG1hcmtQ YXJlbnRzID0gdHJ1ZSk7CiAgICAgdm9pZCBzZXRDaGlsZE5lZWRzTGF5b3V0KGJvb2wgYiwgYm9v bCBtYXJrUGFyZW50cyA9IHRydWUpOwogICAgIHZvaWQgc2V0TmVlZHNQb3NpdGlvbmVkTW92ZW1l bnRMYXlvdXQoKTsKLSAgICB2b2lkIHNldE5lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQo KTsKICAgICB2b2lkIHNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eShib29sLCBib29sIG1h cmtQYXJlbnRzID0gdHJ1ZSk7CiAgICAgdm9pZCBpbnZhbGlkYXRlQ29udGFpbmVyUHJlZmVycmVk TG9naWNhbFdpZHRocygpOwogICAgIApAQCAtODQ4LDcgKzg0Niw2IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX25lZWRzUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0IDoxOwogICAgIGJvb2wgbV9ub3Jt YWxDaGlsZE5lZWRzTGF5b3V0ICAgIDogMTsKICAgICBib29sIG1fcG9zQ2hpbGROZWVkc0xheW91 dCAgICAgICA6IDE7Ci0gICAgYm9vbCBtX25lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQg IDogMTsKICAgICBib29sIG1fcHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5ICAgICAgICAgICA6 IDE7CiAgICAgYm9vbCBtX2Zsb2F0aW5nICAgICAgICAgICAgICAgICAgOiAxOwogCkBAIC05MzQs NyArOTMxLDYgQEAgaW5saW5lIHZvaWQgUmVuZGVyT2JqZWN0OjpzZXROZWVkc0xheW91dChib29s IGIsIGJvb2wgbWFya1BhcmVudHMpCiAgICAgfSBlbHNlIHsKICAgICAgICAgbV9ldmVySGFkTGF5 b3V0ID0gdHJ1ZTsKICAgICAgICAgbV9wb3NDaGlsZE5lZWRzTGF5b3V0ID0gZmFsc2U7Ci0gICAg ICAgIG1fbmVlZHNTaW1wbGlmaWVkTm9ybWFsRmxvd0xheW91dCA9IGZhbHNlOwogICAgICAgICBt X25vcm1hbENoaWxkTmVlZHNMYXlvdXQgPSBmYWxzZTsKICAgICAgICAgbV9uZWVkc1Bvc2l0aW9u ZWRNb3ZlbWVudExheW91dCA9IGZhbHNlOwogICAgIH0KQEAgLTk1MCw3ICs5NDYsNiBAQCBpbmxp bmUgdm9pZCBSZW5kZXJPYmplY3Q6OnNldENoaWxkTmVlZHNMYXlvdXQoYm9vbCBiLCBib29sIG1h cmtQYXJlbnRzKQogICAgICAgICAgICAgbWFya0NvbnRhaW5pbmdCbG9ja3NGb3JMYXlvdXQoKTsK ICAgICB9IGVsc2UgewogICAgICAgICBtX3Bvc0NoaWxkTmVlZHNMYXlvdXQgPSBmYWxzZTsKLSAg ICAgICAgbV9uZWVkc1NpbXBsaWZpZWROb3JtYWxGbG93TGF5b3V0ID0gZmFsc2U7CiAgICAgICAg IG1fbm9ybWFsQ2hpbGROZWVkc0xheW91dCA9IGZhbHNlOwogICAgICAgICBtX25lZWRzUG9zaXRp b25lZE1vdmVtZW50TGF5b3V0ID0gZmFsc2U7CiAgICAgfQpAQCAtOTY3LDE3ICs5NjIsNiBAQCBp bmxpbmUgdm9pZCBSZW5kZXJPYmplY3Q6OnNldE5lZWRzUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0 KCkKICAgICB9CiB9CiAKLWlubGluZSB2b2lkIFJlbmRlck9iamVjdDo6c2V0TmVlZHNTaW1wbGlm aWVkTm9ybWFsRmxvd0xheW91dCgpCi17Ci0gICAgYm9vbCBhbHJlYWR5TmVlZGVkTGF5b3V0ID0g bmVlZHNMYXlvdXQoKTsKLSAgICBtX25lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQgPSB0 cnVlOwotICAgIGlmICghYWxyZWFkeU5lZWRlZExheW91dCkgewotICAgICAgICBtYXJrQ29udGFp bmluZ0Jsb2Nrc0ZvckxheW91dCgpOwotICAgICAgICBpZiAoaGFzTGF5ZXIoKSkKLSAgICAgICAg ICAgIHNldExheWVyTmVlZHNGdWxsUmVwYWludCgpOwotICAgIH0KLX0KLQogaW5saW5lIGJvb2wg b2JqZWN0SXNSZWxheW91dEJvdW5kYXJ5KGNvbnN0IFJlbmRlck9iamVjdCAqb2JqKSAKIHsKICAg ICAvLyBGSVhNRTogSW4gZnV0dXJlIGl0IG1heSBiZSBwb3NzaWJsZSB0byBicm9hZGVuIHRoaXMg Y29uZGl0aW9uIGluIG9yZGVyIHRvIGltcHJvdmUgcGVyZm9ybWFuY2UuCkBAIC05OTgsOCArOTgy LDYgQEAgaW5saW5lIHZvaWQgUmVuZGVyT2JqZWN0OjptYXJrQ29udGFpbmluZ0Jsb2Nrc0Zvckxh eW91dChib29sIHNjaGVkdWxlUmVsYXlvdXQsIFIKICAgICBSZW5kZXJPYmplY3QqIG8gPSBjb250 YWluZXIoKTsKICAgICBSZW5kZXJPYmplY3QqIGxhc3QgPSB0aGlzOwogCi0gICAgYm9vbCBzaW1w bGlmaWVkTm9ybWFsRmxvd0xheW91dCA9IG5lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQo KSAmJiAhc2VsZk5lZWRzTGF5b3V0KCkgJiYgIW5vcm1hbENoaWxkTmVlZHNMYXlvdXQoKTsKLQog ICAgIHdoaWxlIChvKSB7CiAgICAgICAgIC8vIERvbid0IG1hcmsgdGhlIG91dGVybW9zdCBvYmpl Y3Qgb2YgYW4gdW5yb290ZWQgc3VidHJlZS4gVGhhdCBvYmplY3Qgd2lsbCBiZSAKICAgICAgICAg Ly8gbWFya2VkIHdoZW4gdGhlIHN1YnRyZWUgaXMgYWRkZWQgdG8gdGhlIGRvY3VtZW50LgpAQCAt MTAwNywxNSArOTg5LDE3IEBAIGlubGluZSB2b2lkIFJlbmRlck9iamVjdDo6bWFya0NvbnRhaW5p bmdCbG9ja3NGb3JMYXlvdXQoYm9vbCBzY2hlZHVsZVJlbGF5b3V0LCBSCiAgICAgICAgIGlmICgh Y29udGFpbmVyICYmICFvLT5pc1JlbmRlclZpZXcoKSkKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgaWYgKCFsYXN0LT5pc1RleHQoKSAmJiAobGFzdC0+c3R5bGUoKS0+cG9zaXRpb24oKSA9 PSBGaXhlZFBvc2l0aW9uIHx8IGxhc3QtPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gQWJzb2x1dGVQ b3NpdGlvbikpIHsKKyAgICAgICAgICAgIGlmIChsYXN0LT5zdHlsZSgpLT50b3AoKS5pc0F1dG8o KSAmJiBsYXN0LT5zdHlsZSgpLT5ib3R0b20oKS5pc0F1dG8oKSkgeworICAgICAgICAgICAgICAg IFJlbmRlck9iamVjdCogcGFyZW50ID0gbGFzdC0+cGFyZW50KCk7CisgICAgICAgICAgICAgICAg aWYgKCFwYXJlbnQtPm5vcm1hbENoaWxkTmVlZHNMYXlvdXQoKSkgeworICAgICAgICAgICAgICAg ICAgICBwYXJlbnQtPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2UpOworICAgICAgICAg ICAgICAgICAgICBpZiAocGFyZW50ICE9IG5ld1Jvb3QpCisgICAgICAgICAgICAgICAgICAgICAg ICBwYXJlbnQtPm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KHNjaGVkdWxlUmVsYXlvdXQs IG5ld1Jvb3QpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KICAgICAgICAgICAg IGlmIChvLT5tX3Bvc0NoaWxkTmVlZHNMYXlvdXQpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgby0+bV9wb3NDaGlsZE5lZWRzTGF5b3V0ID0gdHJ1ZTsKLSAgICAgICAgICAg IHNpbXBsaWZpZWROb3JtYWxGbG93TGF5b3V0ID0gdHJ1ZTsKLSAgICAgICAgICAgIEFTU0VSVCgh by0+aXNTZXROZWVkc0xheW91dEZvcmJpZGRlbigpKTsKLSAgICAgICAgfSBlbHNlIGlmIChzaW1w bGlmaWVkTm9ybWFsRmxvd0xheW91dCkgewotICAgICAgICAgICAgaWYgKG8tPm1fbmVlZHNTaW1w bGlmaWVkTm9ybWFsRmxvd0xheW91dCkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAg ICAgICBvLT5tX25lZWRzU2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQgPSB0cnVlOwogICAgICAg ICAgICAgQVNTRVJUKCFvLT5pc1NldE5lZWRzTGF5b3V0Rm9yYmlkZGVuKCkpOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgaWYgKG8tPm1fbm9ybWFsQ2hpbGROZWVkc0xheW91dCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCmluZGV4IDM1NzA2ZDUxYmNiMWFi NjBiMDQ0OWViMzBlZWIwMDM4NmNmMmQ0ZTYuLjAyN2RlMDM1NDNmNjRlOGU0MWE1ODEyMWMwMmY2 ZmZjYTJiNmEzNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU YWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcApA QCAtMjYxLDcgKzI2MSw3IEBAIHZvaWQgUmVuZGVyVGFibGU6OmxheW91dCgpCiB7CiAgICAgQVNT RVJUKG5lZWRzTGF5b3V0KCkpOwogCi0gICAgaWYgKHNpbXBsaWZpZWRMYXlvdXQoKSkKKyAgICBp ZiAobGF5b3V0T25seVBvc2l0aW9uZWRPYmplY3RzKCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IHJlY2FsY1NlY3Rpb25zSWZOZWVkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDM0ZTk3MmQxZDQzNWU3NDY4MTI3NjdhZTkxY2Ey M2YzZjg1Y2NjODUuLjgyNTY1NmUxMmVhNTJjNzk0NThjYmZmMjQ1NDQ5M2ZmMmQ2MTcwNDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAt NDkzLDE5ICs0OTMsMTUgQEAgU3R5bGVEaWZmZXJlbmNlIFJlbmRlclN0eWxlOjpkaWZmKGNvbnN0 IFJlbmRlclN0eWxlKiBvdGhlciwgdW5zaWduZWQmIGNoYW5nZWRDb24KICAgICAgICAgcmFyZU5v bkluaGVyaXRlZERhdGEtPm1fY291bnRlclJlc2V0ICE9IG90aGVyLT5yYXJlTm9uSW5oZXJpdGVk RGF0YS0+bV9jb3VudGVyUmVzZXQpCiAgICAgICAgIHJldHVybiBTdHlsZURpZmZlcmVuY2VMYXlv dXQ7CiAKLSAgICBpZiAoKHZpc2liaWxpdHkoKSA9PSBDT0xMQVBTRSkgIT0gKG90aGVyLT52aXNp YmlsaXR5KCkgPT0gQ09MTEFQU0UpKQotICAgICAgICByZXR1cm4gU3R5bGVEaWZmZXJlbmNlTGF5 b3V0OwotCiAgICAgaWYgKChyYXJlTm9uSW5oZXJpdGVkRGF0YS0+b3BhY2l0eSA9PSAxICYmIG90 aGVyLT5yYXJlTm9uSW5oZXJpdGVkRGF0YS0+b3BhY2l0eSA8IDEpIHx8CiAgICAgICAgIChyYXJl Tm9uSW5oZXJpdGVkRGF0YS0+b3BhY2l0eSA8IDEgJiYgb3RoZXItPnJhcmVOb25Jbmhlcml0ZWRE YXRhLT5vcGFjaXR5ID09IDEpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSB3b3VsZCBsaWtlIHRv IHVzZSBTaW1wbGlmaWVkTGF5b3V0IGhlcmUsIGJ1dCB3ZSBjYW4ndCBxdWl0ZSBkbyB0aGF0IHll dC4KLSAgICAgICAgLy8gV2UgbmVlZCB0byBtYWtlIHN1cmUgU2ltcGxpZmllZExheW91dCBjYW4g b3BlcmF0ZSBjb3JyZWN0bHkgb24gUmVuZGVySW5saW5lcyAod2Ugd2lsbCBuZWVkCi0gICAgICAg IC8vIHRvIGFkZCBhIHNlbGZOZWVkc1NpbXBsaWZpZWRMYXlvdXQgYml0IGluIG9yZGVyIHRvIG5v dCBnZXQgY29uZnVzZWQgYW5kIHRhaW50IGV2ZXJ5IGxpbmUpLgotICAgICAgICAvLyBJbiBhZGRp dGlvbiB3ZSBuZWVkIHRvIHNvbHZlIHRoZSBmbG9hdGluZyBvYmplY3QgaXNzdWUgd2hlbiBsYXll cnMgY29tZSBhbmQgZ28uIFJpZ2h0IG5vdwotICAgICAgICAvLyBhIGZ1bGwgbGF5b3V0IGlzIG5l Y2Vzc2FyeSB0byBrZWVwIGZsb2F0aW5nIG9iamVjdCBsaXN0cyBzYW5lLgorICAgICAgICAvLyBG SVhNRTogV2Ugc2hvdWxkIGFkZCBhbiBvcHRpbWl6ZWQgZm9ybSBvZiBsYXlvdXQgdGhhdCBqdXN0 IHJlY29tcHV0ZXMgdmlzdWFsIG92ZXJmbG93LgogICAgICAgICByZXR1cm4gU3R5bGVEaWZmZXJl bmNlTGF5b3V0OwogICAgIH0KIAorICAgIGlmICgodmlzaWJpbGl0eSgpID09IENPTExBUFNFKSAh PSAob3RoZXItPnZpc2liaWxpdHkoKSA9PSBDT0xMQVBTRSkpCisgICAgICAgIHJldHVybiBTdHls ZURpZmZlcmVuY2VMYXlvdXQ7CisgICAgICAgICAgICAgICAgICAgIAogI2lmIEVOQUJMRShTVkcp CiAgICAgLy8gU1ZHUmVuZGVyU3R5bGU6OmRpZmYoKSBtaWdodCBoYXZlIHJldHVybmVkIFN0eWxl RGlmZmVyZW5jZVJlcGFpbnQsIGVnLiBpZiBmaWxsIGNoYW5nZXMuCiAgICAgLy8gSWYgZWcuIHRo ZSBmb250LXNpemUgY2hhbmdlZCBhdCB0aGUgc2FtZSB0aW1lLCB3ZSdyZSBub3QgYWxsb3dlZCB0 byByZXR1cm4gU3R5bGVEaWZmZXJlbmNlUmVwYWludCwKQEAgLTUyMywxMCArNTE5LDEzIEBAIFN0 eWxlRGlmZmVyZW5jZSBSZW5kZXJTdHlsZTo6ZGlmZihjb25zdCBSZW5kZXJTdHlsZSogb3RoZXIs IHVuc2lnbmVkJiBjaGFuZ2VkQ29uCiAgICAgICAgICAgICBpZiAocG9zaXRpb24oKSA9PSBBYnNv bHV0ZVBvc2l0aW9uICYmIHBvc2l0aW9uZWRPYmplY3RNb3ZlZChzdXJyb3VuZC0+b2Zmc2V0LCBv dGhlci0+c3Vycm91bmQtPm9mZnNldCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFN0eWxlRGlm ZmVyZW5jZUxheW91dFBvc2l0aW9uZWRNb3ZlbWVudE9ubHk7CiAKLSAgICAgICAgICAgIC8vIEZJ WE1FOiBXZSB3b3VsZCBsaWtlIHRvIHVzZSBTaW1wbGlmaWVkTGF5b3V0IGZvciByZWxhdGl2ZSBw b3NpdGlvbmluZywgYnV0IHdlIGNhbid0IHF1aXRlIGRvIHRoYXQgeWV0LgotICAgICAgICAgICAg Ly8gV2UgbmVlZCB0byBtYWtlIHN1cmUgU2ltcGxpZmllZExheW91dCBjYW4gb3BlcmF0ZSBjb3Jy ZWN0bHkgb24gUmVuZGVySW5saW5lcyAod2Ugd2lsbCBuZWVkCi0gICAgICAgICAgICAvLyB0byBh ZGQgYSBzZWxmTmVlZHNTaW1wbGlmaWVkTGF5b3V0IGJpdCBpbiBvcmRlciB0byBub3QgZ2V0IGNv bmZ1c2VkIGFuZCB0YWludCBldmVyeSBsaW5lKS4KLSAgICAgICAgICAgIHJldHVybiBTdHlsZURp ZmZlcmVuY2VMYXlvdXQ7CisgICAgICAgICAgICAvLyBGSVhNRTogV2Ugd2lsbCBuZWVkIHRvIGRv IGEgYml0IG9mIHdvcmsgaW4gUmVuZGVyT2JqZWN0L0JveDo6c2V0U3R5bGUgYmVmb3JlIHdlCisg ICAgICAgICAgICAvLyBjYW4gc3RvcCBkb2luZyBhIGxheW91dCB3aGVuIHJlbGF0aXZlIHBvc2l0 aW9uZWQgb2JqZWN0cyBtb3ZlLiAgSW4gcGFydGljdWxhciwgd2UnbGwgbmVlZAorICAgICAgICAg ICAgLy8gdG8gdXBkYXRlIHNjcm9sbGluZyBwb3NpdGlvbnMgYW5kIGZpZ3VyZSBvdXQgaG93IHRv IGRvIGEgcmVwYWludCBwcm9wZXJseSBvZiB0aGUgdXBkYXRlZCBsYXllci4KKyAgICAgICAgICAg IC8vaWYgKG90aGVyLT5wb3NpdGlvbigpID09IFJlbGF0aXZlUG9zaXRpb24pCisgICAgICAgICAg ICAvLyAgICByZXR1cm4gUmVwYWludExheWVyOworICAgICAgICAgICAgLy9lbHNlCisgICAgICAg ICAgICAgICAgcmV0dXJuIFN0eWxlRGlmZmVyZW5jZUxheW91dDsKICAgICAgICAgfSBlbHNlIGlm IChtX2JveC0+ekluZGV4KCkgIT0gb3RoZXItPm1fYm94LT56SW5kZXgoKSB8fCBtX2JveC0+aGFz QXV0b1pJbmRleCgpICE9IG90aGVyLT5tX2JveC0+aGFzQXV0b1pJbmRleCgpIHx8CiAgICAgICAg ICAgICAgICAgIHZpc3VhbC0+Y2xpcCAhPSBvdGhlci0+dmlzdWFsLT5jbGlwIHx8IHZpc3VhbC0+ aGFzQ2xpcCAhPSBvdGhlci0+dmlzdWFsLT5oYXNDbGlwKQogICAgICAgICAgICAgcmV0dXJuIFN0 eWxlRGlmZmVyZW5jZVJlcGFpbnRMYXllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKaW5kZXggMTBhZGM5MmJmMTk5ZGE4 OTI1ODdlMmQwYTc1NTI3MjlmYzNlZDZiYy4uM2M2MmRiZWY4NTgwMTE4Zjg1ZTZlZTg5NDE2M2E1 YjdkMzQxMjJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlQ29uc3RhbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKQEAgLTUxLDcgKzUxLDYgQEAgZW51bSBTdHlsZURpZmZl cmVuY2UgewogICAgIFN0eWxlRGlmZmVyZW5jZVJlcGFpbnQsCiAgICAgU3R5bGVEaWZmZXJlbmNl UmVwYWludExheWVyLAogICAgIFN0eWxlRGlmZmVyZW5jZUxheW91dFBvc2l0aW9uZWRNb3ZlbWVu dE9ubHksCi0gICAgU3R5bGVEaWZmZXJlbmNlU2ltcGxpZmllZExheW91dCwKICAgICBTdHlsZURp ZmZlcmVuY2VMYXlvdXQKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvUmVuZGVyU1ZHVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1RleHQuY3BwCmluZGV4IDM0YzAyZWZiYjdmYmQyMTc4ODA1NWE4M2YzMWMyNTE5N2M3 NzNmZTcuLjU2ZDkzMDY5NTdhMWQwMzhmMWYxOTJiOTQ1MjRlZGZlZjU5ZDA4Y2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHVGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdUZXh0LmNwcApAQCAtMTM0LDcg KzEzNCw3IEBAIHZvaWQgUmVuZGVyU1ZHVGV4dDo6bGF5b3V0KCkKICAgICAvLyBSZWR1Y2VkIHZl cnNpb24gb2YgUmVuZGVyQmxvY2s6OmxheW91dEJsb2NrKCksIHdoaWNoIG9ubHkgdGFrZXMgY2Fy ZSBvZiBTVkcgdGV4dC4KICAgICAvLyBBbGwgaWYgYnJhbmNoZXMgdGhhdCBjb3VsZCBjYXVzZSBl YXJseSBleGl0IGluIFJlbmRlckJsb2NrcyBsYXlvdXRCbG9jaygpIG1ldGhvZCBhcmUgdHVybmVk IGludG8gYXNzZXJ0aW9ucy4KICAgICBBU1NFUlQoIWlzSW5saW5lKCkpOwotICAgIEFTU0VSVCgh c2ltcGxpZmllZExheW91dCgpKTsKKyAgICBBU1NFUlQoIWxheW91dE9ubHlQb3NpdGlvbmVkT2Jq ZWN0cygpKTsKICAgICBBU1NFUlQoIXNjcm9sbHNPdmVyZmxvdygpKTsKICAgICBBU1NFUlQoIWhh c0NvbnRyb2xDbGlwKCkpOwogICAgIEFTU0VSVCghaGFzQ29sdW1ucygpKTsK