177977 2017-10-05 15:59:21 -0700 RenderTable should not hold section raw pointers 2017-10-05 19:41:41 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1357305 0 zalan 2017-10-05 15:59:21 -0700 head, foot, first body. 1357318 1 webkit-bug-importer 2017-10-05 16:17:22 -0700 <rdar://problem/34846034> 1357323 2 322933 zalan 2017-10-05 16:24:32 -0700 Created attachment 322933 Patch 1357327 3 322935 zalan 2017-10-05 16:35:45 -0700 Created attachment 322935 Patch 1357415 4 322935 commit-queue 2017-10-05 19:41:39 -0700 Comment on attachment 322935 Patch Clearing flags on attachment: 322935 Committed r222953: <http://trac.webkit.org/changeset/222953> 1357416 5 commit-queue 2017-10-05 19:41:41 -0700 All reviewed patches have been landed. Closing bug. 322933 2017-10-05 16:24:32 -0700 2017-10-05 16:32:40 -0700 Patch bug-177977-20171005162431.patch text/plain 9059 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyOTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI4MTkxMGYzMzFjNTcx ZmU4YjRhNDliMTkzMzllY2Y0ZGM5NTdhYy4uODBkODMwN2ZlNTRmYTgxMjI5OGQ1ZDQ3MzM5M2Rl MzQ0ZjY0ODY3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEwLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGFibGUgc2hvdWxk IG5vdCBob2xkIHNlY3Rpb24gcmF3IHBvaW50ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc5NzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM0 ODQ2MDM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgZW5hYmxlcyB1cyB0byByZW1vdmUgZm9yY2VkIHJlY2FsY1NlY3Rpb25zIGNhbGxzLgor CisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OlJlbmRl clRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OnJlc2V0U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9y ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6YWRkQ2hpbGQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGFibGU6OnJlY2FsY1NlY3Rpb25zIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRhYmxlOjpzZWN0aW9uQWJvdmUgY29uc3QpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJUYWJsZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OmhlYWRl ciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6Zm9vdGVyIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjpmaXJzdEJvZHkgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OnRvcFNlY3Rpb24gY29uc3QpOgorCiAyMDE3LTEwLTA1 ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgQnVnIDE3Nzg5 MzogRGlzYWJsZSAtV2Nhc3QtcXVhbCBmb3IgbmV3IGNsYW5nIGNvbXBpbGVyIGluIEFwcGxlIHBv cnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAppbmRleCBhNjkxNmE3 YTNiM2MzNDM5ZGI4ZDBjODc0OWZkYmMzMGJkOWEyMmUxLi5lYTkwY2JjYmY5YjM2NjMwMDE0MWM2 NzI5MmU2OWQyZjdmZWQ3MzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZS5jcHAKQEAgLTU1LDkgKzU1LDYgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAogUmVu ZGVyVGFibGU6OlJlbmRlclRhYmxlKEVsZW1lbnQmIGVsZW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5 bGUpCiAgICAgOiBSZW5kZXJCbG9jayhlbGVtZW50LCBXVEZNb3ZlKHN0eWxlKSwgMCkKLSAgICAs IG1faGVhZChudWxscHRyKQotICAgICwgbV9mb290KG51bGxwdHIpCi0gICAgLCBtX2ZpcnN0Qm9k eShudWxscHRyKQogICAgICwgbV9jdXJyZW50Qm9yZGVyKG51bGxwdHIpCiAgICAgLCBtX2NvbGxh cHNlZEJvcmRlcnNWYWxpZChmYWxzZSkKICAgICAsIG1fY29sbGFwc2VkRW1wdHlCb3JkZXJJc1By ZXNlbnQoZmFsc2UpCkBAIC03Nyw5ICs3NCw2IEBAIFJlbmRlclRhYmxlOjpSZW5kZXJUYWJsZShF bGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogCiBSZW5kZXJUYWJsZTo6UmVu ZGVyVGFibGUoRG9jdW1lbnQmIGRvY3VtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogICAgIDog UmVuZGVyQmxvY2soZG9jdW1lbnQsIFdURk1vdmUoc3R5bGUpLCAwKQotICAgICwgbV9oZWFkKG51 bGxwdHIpCi0gICAgLCBtX2Zvb3QobnVsbHB0cikKLSAgICAsIG1fZmlyc3RCb2R5KG51bGxwdHIp CiAgICAgLCBtX2N1cnJlbnRCb3JkZXIobnVsbHB0cikKICAgICAsIG1fY29sbGFwc2VkQm9yZGVy c1ZhbGlkKGZhbHNlKQogICAgICwgbV9jb2xsYXBzZWRFbXB0eUJvcmRlcklzUHJlc2VudChmYWxz ZSkKQEAgLTEyNSwxNSArMTE5LDE1IEBAIHZvaWQgUmVuZGVyVGFibGU6OnN0eWxlRGlkQ2hhbmdl KFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5CiAgICAgICAg IGludmFsaWRhdGVDb2xsYXBzZWRCb3JkZXJzKCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgdm9pZCBy ZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUoUmVuZGVyVGFibGVTZWN0aW9uKiYgcHRyLCBS ZW5kZXJPYmplY3QqIGJlZm9yZSkKK3N0YXRpYyBpbmxpbmUgdm9pZCByZXNldFNlY3Rpb25Qb2lu dGVySWZOb3RCZWZvcmUoV2Vha1B0cjxSZW5kZXJUYWJsZVNlY3Rpb24+JiBzZWN0aW9uLCBSZW5k ZXJPYmplY3QqIGJlZm9yZSkKIHsKLSAgICBpZiAoIWJlZm9yZSB8fCAhcHRyKQorICAgIGlmICgh YmVmb3JlIHx8ICFzZWN0aW9uKQogICAgICAgICByZXR1cm47Ci0gICAgUmVuZGVyT2JqZWN0KiBv ID0gYmVmb3JlLT5wcmV2aW91c1NpYmxpbmcoKTsKLSAgICB3aGlsZSAobyAmJiBvICE9IHB0cikK LSAgICAgICAgbyA9IG8tPnByZXZpb3VzU2libGluZygpOwotICAgIGlmICghbykKLSAgICAgICAg cHRyID0gMDsKKyAgICBhdXRvKiBwcmV2aW91c1NpYmxpbmcgPSBiZWZvcmUtPnByZXZpb3VzU2li bGluZygpOworICAgIHdoaWxlIChwcmV2aW91c1NpYmxpbmcgJiYgcHJldmlvdXNTaWJsaW5nICE9 IHNlY3Rpb24pCisgICAgICAgIHByZXZpb3VzU2libGluZyA9IHByZXZpb3VzU2libGluZy0+cHJl dmlvdXNTaWJsaW5nKCk7CisgICAgaWYgKCFwcmV2aW91c1NpYmxpbmcpCisgICAgICAgIHNlY3Rp b24uY2xlYXIoKTsKIH0KIAogdm9pZCBSZW5kZXJUYWJsZTo6YWRkQ2hpbGQoUmVuZGVyUHRyPFJl bmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCkBAIC0xNTAsMTgg KzE0NCwxOCBAQCB2b2lkIFJlbmRlclRhYmxlOjphZGRDaGlsZChSZW5kZXJQdHI8UmVuZGVyT2Jq ZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaAogICAgICAgICAgICAgY2FzZSBUQUJM RV9IRUFERVJfR1JPVVA6CiAgICAgICAgICAgICAgICAgcmVzZXRTZWN0aW9uUG9pbnRlcklmTm90 QmVmb3JlKG1faGVhZCwgYmVmb3JlQ2hpbGQpOwogICAgICAgICAgICAgICAgIGlmICghbV9oZWFk KSB7Ci0gICAgICAgICAgICAgICAgICAgIG1faGVhZCA9IGRvd25jYXN0PFJlbmRlclRhYmxlU2Vj dGlvbj4oY2hpbGQuZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICBtX2hlYWQgPSBtYWtlV2Vh a1B0cihkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KGNoaWxkLmdldCgpKSk7CiAgICAgICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgcmVzZXRTZWN0aW9uUG9pbnRl cklmTm90QmVmb3JlKG1fZmlyc3RCb2R5LCBiZWZvcmVDaGlsZCk7CiAgICAgICAgICAgICAgICAg ICAgIGlmICghbV9maXJzdEJvZHkpIAotICAgICAgICAgICAgICAgICAgICAgICAgbV9maXJzdEJv ZHkgPSBkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KGNoaWxkLmdldCgpKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVuZGVy VGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICB3cmFwSW5Bbm9ueW1vdXNTZWN0aW9uID0gZmFsc2U7CiAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICBjYXNlIFRBQkxFX0ZPT1RFUl9HUk9VUDoKICAgICAgICAgICAg ICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUobV9mb290LCBiZWZvcmVDaGlsZCk7 CiAgICAgICAgICAgICAgICAgaWYgKCFtX2Zvb3QpIHsKLSAgICAgICAgICAgICAgICAgICAgbV9m b290ID0gZG93bmNhc3Q8UmVuZGVyVGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSk7CisgICAgICAg ICAgICAgICAgICAgIG1fZm9vdCA9IG1ha2VXZWFrUHRyKGRvd25jYXN0PFJlbmRlclRhYmxlU2Vj dGlvbj4oY2hpbGQuZ2V0KCkpKTsKICAgICAgICAgICAgICAgICAgICAgd3JhcEluQW5vbnltb3Vz U2VjdGlvbiA9IGZhbHNlOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg ICAgICB9CkBAIC0xNjksNyArMTYzLDcgQEAgdm9pZCBSZW5kZXJUYWJsZTo6YWRkQ2hpbGQoUmVu ZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2gKICAgICAg ICAgICAgIGNhc2UgVEFCTEVfUk9XX0dST1VQOgogICAgICAgICAgICAgICAgIHJlc2V0U2VjdGlv blBvaW50ZXJJZk5vdEJlZm9yZShtX2ZpcnN0Qm9keSwgYmVmb3JlQ2hpbGQpOwogICAgICAgICAg ICAgICAgIGlmICghbV9maXJzdEJvZHkpCi0gICAgICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5 ID0gZG93bmNhc3Q8UmVuZGVyVGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSk7CisgICAgICAgICAg ICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVuZGVyVGFibGVT ZWN0aW9uPihjaGlsZC5nZXQoKSkpOwogICAgICAgICAgICAgICAgIHdyYXBJbkFub255bW91c1Nl Y3Rpb24gPSBmYWxzZTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1 bHQ6CkBAIC0xMDU1LDkgKzEwNDksOSBAQCB2b2lkIFJlbmRlclRhYmxlOjpyZWNhbGNTZWN0aW9u cygpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG1fbmVlZHNTZWN0aW9uUmVjYWxjKTsKIAotICAgIG1f aGVhZCA9IDA7Ci0gICAgbV9mb290ID0gMDsKLSAgICBtX2ZpcnN0Qm9keSA9IDA7CisgICAgbV9o ZWFkLmNsZWFyKCk7CisgICAgbV9mb290LmNsZWFyKCk7CisgICAgbV9maXJzdEJvZHkuY2xlYXIo KTsKICAgICBtX2hhc0NvbEVsZW1lbnRzID0gZmFsc2U7CiAgICAgbV9oYXNDZWxsQ29sc3BhblRo YXREZXRlcm1pbmVzVGFibGVXaWR0aCA9IGhhc0NlbGxDb2xzcGFuVGhhdERldGVybWluZXNUYWJs ZVdpZHRoKCk7CiAKQEAgLTEwNzQsOSArMTA2OCw5IEBAIHZvaWQgUmVuZGVyVGFibGU6OnJlY2Fs Y1NlY3Rpb25zKCkgY29uc3QKICAgICAgICAgICAgIGlmIChpczxSZW5kZXJUYWJsZVNlY3Rpb24+ KCpjaGlsZCkpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJUYWJsZVNlY3Rpb24mIHNlY3Rpb24g PSBkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KCpjaGlsZCk7CiAgICAgICAgICAgICAgICAg aWYgKCFtX2hlYWQpCi0gICAgICAgICAgICAgICAgICAgIG1faGVhZCA9ICZzZWN0aW9uOworICAg ICAgICAgICAgICAgICAgICBtX2hlYWQgPSBtYWtlV2Vha1B0cihzZWN0aW9uKTsKICAgICAgICAg ICAgICAgICBlbHNlIGlmICghbV9maXJzdEJvZHkpCi0gICAgICAgICAgICAgICAgICAgIG1fZmly c3RCb2R5ID0gJnNlY3Rpb247CisgICAgICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFr ZVdlYWtQdHIoc2VjdGlvbik7CiAgICAgICAgICAgICAgICAgc2VjdGlvbi5yZWNhbGNDZWxsc0lm TmVlZGVkKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKQEAgLTEwODQsOSAr MTA3OCw5IEBAIHZvaWQgUmVuZGVyVGFibGU6OnJlY2FsY1NlY3Rpb25zKCkgY29uc3QKICAgICAg ICAgICAgIGlmIChpczxSZW5kZXJUYWJsZVNlY3Rpb24+KCpjaGlsZCkpIHsKICAgICAgICAgICAg ICAgICBSZW5kZXJUYWJsZVNlY3Rpb24mIHNlY3Rpb24gPSBkb3duY2FzdDxSZW5kZXJUYWJsZVNl Y3Rpb24+KCpjaGlsZCk7CiAgICAgICAgICAgICAgICAgaWYgKCFtX2Zvb3QpCi0gICAgICAgICAg ICAgICAgICAgIG1fZm9vdCA9ICZzZWN0aW9uOworICAgICAgICAgICAgICAgICAgICBtX2Zvb3Qg PSBtYWtlV2Vha1B0cihzZWN0aW9uKTsKICAgICAgICAgICAgICAgICBlbHNlIGlmICghbV9maXJz dEJvZHkpCi0gICAgICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gJnNlY3Rpb247CisgICAg ICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoc2VjdGlvbik7CiAgICAg ICAgICAgICAgICAgc2VjdGlvbi5yZWNhbGNDZWxsc0lmTmVlZGVkKCk7CiAgICAgICAgICAgICB9 CiAgICAgICAgICAgICBicmVhazsKQEAgLTEwOTQsNyArMTA4OCw3IEBAIHZvaWQgUmVuZGVyVGFi bGU6OnJlY2FsY1NlY3Rpb25zKCkgY29uc3QKICAgICAgICAgICAgIGlmIChpczxSZW5kZXJUYWJs ZVNlY3Rpb24+KCpjaGlsZCkpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJUYWJsZVNlY3Rpb24m IHNlY3Rpb24gPSBkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KCpjaGlsZCk7CiAgICAgICAg ICAgICAgICAgaWYgKCFtX2ZpcnN0Qm9keSkKLSAgICAgICAgICAgICAgICAgICAgbV9maXJzdEJv ZHkgPSAmc2VjdGlvbjsKKyAgICAgICAgICAgICAgICAgICAgbV9maXJzdEJvZHkgPSBtYWtlV2Vh a1B0cihzZWN0aW9uKTsKICAgICAgICAgICAgICAgICBzZWN0aW9uLnJlY2FsY0NlbGxzSWZOZWVk ZWQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTM2Myw3ICsxMzU3 LDcgQEAgUmVuZGVyVGFibGVTZWN0aW9uKiBSZW5kZXJUYWJsZTo6c2VjdGlvbkFib3ZlKGNvbnN0 IFJlbmRlclRhYmxlU2VjdGlvbiogc2VjdGlvbiwKICAgICAgICAgcHJldlNlY3Rpb24gPSBwcmV2 U2VjdGlvbi0+cHJldmlvdXNTaWJsaW5nKCk7CiAgICAgfQogICAgIGlmICghcHJldlNlY3Rpb24g JiYgbV9oZWFkICYmIChza2lwRW1wdHlTZWN0aW9ucyA9PSBEb05vdFNraXBFbXB0eVNlY3Rpb25z IHx8IG1faGVhZC0+bnVtUm93cygpKSkKLSAgICAgICAgcHJldlNlY3Rpb24gPSBtX2hlYWQ7Cisg ICAgICAgIHByZXZTZWN0aW9uID0gbV9oZWFkLmdldCgpOwogICAgIHJldHVybiBkb3duY2FzdDxS ZW5kZXJUYWJsZVNlY3Rpb24+KHByZXZTZWN0aW9uKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGUuaAppbmRleCAzYzhiZGM1MWUxYzhjMDljYzg2NWNjNjViNzY2Yzc2NTZj YzRjMTAyLi42MDNiODFlYzZmOWVkY2U5NWIwZjFlZjQwZTUyYTZkNTI3YjAxNmRmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaApAQCAtMTUzLDkgKzE1Myw5IEBAIHB1Ymxp YzoKICAgICAgICAgbV9jb2x1bW5Qb3NbaW5kZXhdID0gcG9zaXRpb247CiAgICAgfQogCi0gICAg UmVuZGVyVGFibGVTZWN0aW9uKiBoZWFkZXIoKSBjb25zdCB7IHJldHVybiBtX2hlYWQ7IH0KLSAg ICBSZW5kZXJUYWJsZVNlY3Rpb24qIGZvb3RlcigpIGNvbnN0IHsgcmV0dXJuIG1fZm9vdDsgfQot ICAgIFJlbmRlclRhYmxlU2VjdGlvbiogZmlyc3RCb2R5KCkgY29uc3QgeyByZXR1cm4gbV9maXJz dEJvZHk7IH0KKyAgICBSZW5kZXJUYWJsZVNlY3Rpb24qIGhlYWRlcigpIGNvbnN0IHsgcmV0dXJu IG1faGVhZC5nZXQoKTsgfQorICAgIFJlbmRlclRhYmxlU2VjdGlvbiogZm9vdGVyKCkgY29uc3Qg eyByZXR1cm4gbV9mb290LmdldCgpOyB9CisgICAgUmVuZGVyVGFibGVTZWN0aW9uKiBmaXJzdEJv ZHkoKSBjb25zdCB7IHJldHVybiBtX2ZpcnN0Qm9keS5nZXQoKTsgfQogCiAgICAgLy8gVGhpcyBm dW5jdGlvbiByZXR1cm5zIDAgaWYgdGhlIHRhYmxlIGhhcyBubyBzZWN0aW9uLgogICAgIFJlbmRl clRhYmxlU2VjdGlvbiogdG9wU2VjdGlvbigpIGNvbnN0OwpAQCAtMzMyLDkgKzMzMiw5IEBAIHBy aXZhdGU6CiAgICAgdHlwZWRlZiBIYXNoTWFwPGNvbnN0IFJlbmRlclRhYmxlQ29sKiwgdW5zaWdu ZWQ+IEVmZmVjdGl2ZUNvbHVtbkluZGV4TWFwOwogICAgIG11dGFibGUgRWZmZWN0aXZlQ29sdW1u SW5kZXhNYXAgbV9lZmZlY3RpdmVDb2x1bW5JbmRleE1hcDsKIAotICAgIG11dGFibGUgUmVuZGVy VGFibGVTZWN0aW9uKiBtX2hlYWQ7Ci0gICAgbXV0YWJsZSBSZW5kZXJUYWJsZVNlY3Rpb24qIG1f Zm9vdDsKLSAgICBtdXRhYmxlIFJlbmRlclRhYmxlU2VjdGlvbiogbV9maXJzdEJvZHk7CisgICAg bXV0YWJsZSBXZWFrUHRyPFJlbmRlclRhYmxlU2VjdGlvbj4gbV9oZWFkOworICAgIG11dGFibGUg V2Vha1B0cjxSZW5kZXJUYWJsZVNlY3Rpb24+IG1fZm9vdDsKKyAgICBtdXRhYmxlIFdlYWtQdHI8 UmVuZGVyVGFibGVTZWN0aW9uPiBtX2ZpcnN0Qm9keTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxU YWJsZUxheW91dD4gbV90YWJsZUxheW91dDsKIApAQCAtMzcyLDEwICszNzIsMTAgQEAgaW5saW5l IFJlbmRlclRhYmxlU2VjdGlvbiogUmVuZGVyVGFibGU6OnRvcFNlY3Rpb24oKSBjb25zdAogewog ICAgIEFTU0VSVCghbmVlZHNTZWN0aW9uUmVjYWxjKCkpOwogICAgIGlmIChtX2hlYWQpCi0gICAg ICAgIHJldHVybiBtX2hlYWQ7CisgICAgICAgIHJldHVybiBtX2hlYWQuZ2V0KCk7CiAgICAgaWYg KG1fZmlyc3RCb2R5KQotICAgICAgICByZXR1cm4gbV9maXJzdEJvZHk7Ci0gICAgcmV0dXJuIG1f Zm9vdDsKKyAgICAgICAgcmV0dXJuIG1fZmlyc3RCb2R5LmdldCgpOworICAgIHJldHVybiBtX2Zv b3QuZ2V0KCk7CiB9CiAKIGlubGluZSBib29sIGlzRGlyZWN0aW9uU2FtZShjb25zdCBSZW5kZXJC b3gqIHRhYmxlSXRlbSwgY29uc3QgUmVuZGVyQm94KiBvdGhlclRhYmxlSXRlbSkgeyByZXR1cm4g dGFibGVJdGVtICYmIG90aGVyVGFibGVJdGVtID8gdGFibGVJdGVtLT5zdHlsZSgpLmRpcmVjdGlv bigpID09IG90aGVyVGFibGVJdGVtLT5zdHlsZSgpLmRpcmVjdGlvbigpIDogdHJ1ZTsgfQo= 322935 2017-10-05 16:35:45 -0700 2017-10-05 19:41:39 -0700 Patch bug-177977-20171005163544.patch text/plain 9843 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyOTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI4MTkxMGYzMzFjNTcx ZmU4YjRhNDliMTkzMzllY2Y0ZGM5NTdhYy4uODBkODMwN2ZlNTRmYTgxMjI5OGQ1ZDQ3MzM5M2Rl MzQ0ZjY0ODY3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEwLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGFibGUgc2hvdWxk IG5vdCBob2xkIHNlY3Rpb24gcmF3IHBvaW50ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc5NzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM0 ODQ2MDM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgZW5hYmxlcyB1cyB0byByZW1vdmUgZm9yY2VkIHJlY2FsY1NlY3Rpb25zIGNhbGxzLgor CisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OlJlbmRl clRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OnJlc2V0U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9y ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6YWRkQ2hpbGQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGFibGU6OnJlY2FsY1NlY3Rpb25zIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRhYmxlOjpzZWN0aW9uQWJvdmUgY29uc3QpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJUYWJsZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OmhlYWRl ciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6Zm9vdGVyIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjpmaXJzdEJvZHkgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OnRvcFNlY3Rpb24gY29uc3QpOgorCiAyMDE3LTEwLTA1 ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgQnVnIDE3Nzg5 MzogRGlzYWJsZSAtV2Nhc3QtcXVhbCBmb3IgbmV3IGNsYW5nIGNvbXBpbGVyIGluIEFwcGxlIHBv cnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAppbmRleCBhNjkxNmE3 YTNiM2MzNDM5ZGI4ZDBjODc0OWZkYmMzMGJkOWEyMmUxLi43MTkwZGVmODQ1ZjM1MGU3YWNiMTE0 YTNhYmYwMmNmNGMwMWNmZjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZS5jcHAKQEAgLTU1LDkgKzU1LDYgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAogUmVu ZGVyVGFibGU6OlJlbmRlclRhYmxlKEVsZW1lbnQmIGVsZW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5 bGUpCiAgICAgOiBSZW5kZXJCbG9jayhlbGVtZW50LCBXVEZNb3ZlKHN0eWxlKSwgMCkKLSAgICAs IG1faGVhZChudWxscHRyKQotICAgICwgbV9mb290KG51bGxwdHIpCi0gICAgLCBtX2ZpcnN0Qm9k eShudWxscHRyKQogICAgICwgbV9jdXJyZW50Qm9yZGVyKG51bGxwdHIpCiAgICAgLCBtX2NvbGxh cHNlZEJvcmRlcnNWYWxpZChmYWxzZSkKICAgICAsIG1fY29sbGFwc2VkRW1wdHlCb3JkZXJJc1By ZXNlbnQoZmFsc2UpCkBAIC03Nyw5ICs3NCw2IEBAIFJlbmRlclRhYmxlOjpSZW5kZXJUYWJsZShF bGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogCiBSZW5kZXJUYWJsZTo6UmVu ZGVyVGFibGUoRG9jdW1lbnQmIGRvY3VtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogICAgIDog UmVuZGVyQmxvY2soZG9jdW1lbnQsIFdURk1vdmUoc3R5bGUpLCAwKQotICAgICwgbV9oZWFkKG51 bGxwdHIpCi0gICAgLCBtX2Zvb3QobnVsbHB0cikKLSAgICAsIG1fZmlyc3RCb2R5KG51bGxwdHIp CiAgICAgLCBtX2N1cnJlbnRCb3JkZXIobnVsbHB0cikKICAgICAsIG1fY29sbGFwc2VkQm9yZGVy c1ZhbGlkKGZhbHNlKQogICAgICwgbV9jb2xsYXBzZWRFbXB0eUJvcmRlcklzUHJlc2VudChmYWxz ZSkKQEAgLTEyNSwxNSArMTE5LDE1IEBAIHZvaWQgUmVuZGVyVGFibGU6OnN0eWxlRGlkQ2hhbmdl KFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5CiAgICAgICAg IGludmFsaWRhdGVDb2xsYXBzZWRCb3JkZXJzKCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgdm9pZCBy ZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUoUmVuZGVyVGFibGVTZWN0aW9uKiYgcHRyLCBS ZW5kZXJPYmplY3QqIGJlZm9yZSkKK3N0YXRpYyBpbmxpbmUgdm9pZCByZXNldFNlY3Rpb25Qb2lu dGVySWZOb3RCZWZvcmUoV2Vha1B0cjxSZW5kZXJUYWJsZVNlY3Rpb24+JiBzZWN0aW9uLCBSZW5k ZXJPYmplY3QqIGJlZm9yZSkKIHsKLSAgICBpZiAoIWJlZm9yZSB8fCAhcHRyKQorICAgIGlmICgh YmVmb3JlIHx8ICFzZWN0aW9uKQogICAgICAgICByZXR1cm47Ci0gICAgUmVuZGVyT2JqZWN0KiBv ID0gYmVmb3JlLT5wcmV2aW91c1NpYmxpbmcoKTsKLSAgICB3aGlsZSAobyAmJiBvICE9IHB0cikK LSAgICAgICAgbyA9IG8tPnByZXZpb3VzU2libGluZygpOwotICAgIGlmICghbykKLSAgICAgICAg cHRyID0gMDsKKyAgICBhdXRvKiBwcmV2aW91c1NpYmxpbmcgPSBiZWZvcmUtPnByZXZpb3VzU2li bGluZygpOworICAgIHdoaWxlIChwcmV2aW91c1NpYmxpbmcgJiYgcHJldmlvdXNTaWJsaW5nICE9 IHNlY3Rpb24pCisgICAgICAgIHByZXZpb3VzU2libGluZyA9IHByZXZpb3VzU2libGluZy0+cHJl dmlvdXNTaWJsaW5nKCk7CisgICAgaWYgKCFwcmV2aW91c1NpYmxpbmcpCisgICAgICAgIHNlY3Rp b24uY2xlYXIoKTsKIH0KIAogdm9pZCBSZW5kZXJUYWJsZTo6YWRkQ2hpbGQoUmVuZGVyUHRyPFJl bmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCkBAIC0xNTAsMTgg KzE0NCwxOCBAQCB2b2lkIFJlbmRlclRhYmxlOjphZGRDaGlsZChSZW5kZXJQdHI8UmVuZGVyT2Jq ZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaAogICAgICAgICAgICAgY2FzZSBUQUJM RV9IRUFERVJfR1JPVVA6CiAgICAgICAgICAgICAgICAgcmVzZXRTZWN0aW9uUG9pbnRlcklmTm90 QmVmb3JlKG1faGVhZCwgYmVmb3JlQ2hpbGQpOwogICAgICAgICAgICAgICAgIGlmICghbV9oZWFk KSB7Ci0gICAgICAgICAgICAgICAgICAgIG1faGVhZCA9IGRvd25jYXN0PFJlbmRlclRhYmxlU2Vj dGlvbj4oY2hpbGQuZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICBtX2hlYWQgPSBtYWtlV2Vh a1B0cihkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KGNoaWxkLmdldCgpKSk7CiAgICAgICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgcmVzZXRTZWN0aW9uUG9pbnRl cklmTm90QmVmb3JlKG1fZmlyc3RCb2R5LCBiZWZvcmVDaGlsZCk7CiAgICAgICAgICAgICAgICAg ICAgIGlmICghbV9maXJzdEJvZHkpIAotICAgICAgICAgICAgICAgICAgICAgICAgbV9maXJzdEJv ZHkgPSBkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KGNoaWxkLmdldCgpKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVuZGVy VGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICB3cmFwSW5Bbm9ueW1vdXNTZWN0aW9uID0gZmFsc2U7CiAgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICBjYXNlIFRBQkxFX0ZPT1RFUl9HUk9VUDoKICAgICAgICAgICAg ICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUobV9mb290LCBiZWZvcmVDaGlsZCk7 CiAgICAgICAgICAgICAgICAgaWYgKCFtX2Zvb3QpIHsKLSAgICAgICAgICAgICAgICAgICAgbV9m b290ID0gZG93bmNhc3Q8UmVuZGVyVGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSk7CisgICAgICAg ICAgICAgICAgICAgIG1fZm9vdCA9IG1ha2VXZWFrUHRyKGRvd25jYXN0PFJlbmRlclRhYmxlU2Vj dGlvbj4oY2hpbGQuZ2V0KCkpKTsKICAgICAgICAgICAgICAgICAgICAgd3JhcEluQW5vbnltb3Vz U2VjdGlvbiA9IGZhbHNlOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg ICAgICB9CkBAIC0xNjksNyArMTYzLDcgQEAgdm9pZCBSZW5kZXJUYWJsZTo6YWRkQ2hpbGQoUmVu ZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2gKICAgICAg ICAgICAgIGNhc2UgVEFCTEVfUk9XX0dST1VQOgogICAgICAgICAgICAgICAgIHJlc2V0U2VjdGlv blBvaW50ZXJJZk5vdEJlZm9yZShtX2ZpcnN0Qm9keSwgYmVmb3JlQ2hpbGQpOwogICAgICAgICAg ICAgICAgIGlmICghbV9maXJzdEJvZHkpCi0gICAgICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5 ID0gZG93bmNhc3Q8UmVuZGVyVGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSk7CisgICAgICAgICAg ICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVuZGVyVGFibGVT ZWN0aW9uPihjaGlsZC5nZXQoKSkpOwogICAgICAgICAgICAgICAgIHdyYXBJbkFub255bW91c1Nl Y3Rpb24gPSBmYWxzZTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1 bHQ6CkBAIC0xMDU1LDkgKzEwNDksOSBAQCB2b2lkIFJlbmRlclRhYmxlOjpyZWNhbGNTZWN0aW9u cygpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG1fbmVlZHNTZWN0aW9uUmVjYWxjKTsKIAotICAgIG1f aGVhZCA9IDA7Ci0gICAgbV9mb290ID0gMDsKLSAgICBtX2ZpcnN0Qm9keSA9IDA7CisgICAgbV9o ZWFkLmNsZWFyKCk7CisgICAgbV9mb290LmNsZWFyKCk7CisgICAgbV9maXJzdEJvZHkuY2xlYXIo KTsKICAgICBtX2hhc0NvbEVsZW1lbnRzID0gZmFsc2U7CiAgICAgbV9oYXNDZWxsQ29sc3BhblRo YXREZXRlcm1pbmVzVGFibGVXaWR0aCA9IGhhc0NlbGxDb2xzcGFuVGhhdERldGVybWluZXNUYWJs ZVdpZHRoKCk7CiAKQEAgLTEwNzQsOSArMTA2OCw5IEBAIHZvaWQgUmVuZGVyVGFibGU6OnJlY2Fs Y1NlY3Rpb25zKCkgY29uc3QKICAgICAgICAgICAgIGlmIChpczxSZW5kZXJUYWJsZVNlY3Rpb24+ KCpjaGlsZCkpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJUYWJsZVNlY3Rpb24mIHNlY3Rpb24g PSBkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KCpjaGlsZCk7CiAgICAgICAgICAgICAgICAg aWYgKCFtX2hlYWQpCi0gICAgICAgICAgICAgICAgICAgIG1faGVhZCA9ICZzZWN0aW9uOworICAg ICAgICAgICAgICAgICAgICBtX2hlYWQgPSBtYWtlV2Vha1B0cihzZWN0aW9uKTsKICAgICAgICAg ICAgICAgICBlbHNlIGlmICghbV9maXJzdEJvZHkpCi0gICAgICAgICAgICAgICAgICAgIG1fZmly c3RCb2R5ID0gJnNlY3Rpb247CisgICAgICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFr ZVdlYWtQdHIoc2VjdGlvbik7CiAgICAgICAgICAgICAgICAgc2VjdGlvbi5yZWNhbGNDZWxsc0lm TmVlZGVkKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKQEAgLTEwODQsOSAr MTA3OCw5IEBAIHZvaWQgUmVuZGVyVGFibGU6OnJlY2FsY1NlY3Rpb25zKCkgY29uc3QKICAgICAg ICAgICAgIGlmIChpczxSZW5kZXJUYWJsZVNlY3Rpb24+KCpjaGlsZCkpIHsKICAgICAgICAgICAg ICAgICBSZW5kZXJUYWJsZVNlY3Rpb24mIHNlY3Rpb24gPSBkb3duY2FzdDxSZW5kZXJUYWJsZVNl Y3Rpb24+KCpjaGlsZCk7CiAgICAgICAgICAgICAgICAgaWYgKCFtX2Zvb3QpCi0gICAgICAgICAg ICAgICAgICAgIG1fZm9vdCA9ICZzZWN0aW9uOworICAgICAgICAgICAgICAgICAgICBtX2Zvb3Qg PSBtYWtlV2Vha1B0cihzZWN0aW9uKTsKICAgICAgICAgICAgICAgICBlbHNlIGlmICghbV9maXJz dEJvZHkpCi0gICAgICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gJnNlY3Rpb247CisgICAg ICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoc2VjdGlvbik7CiAgICAg ICAgICAgICAgICAgc2VjdGlvbi5yZWNhbGNDZWxsc0lmTmVlZGVkKCk7CiAgICAgICAgICAgICB9 CiAgICAgICAgICAgICBicmVhazsKQEAgLTEwOTQsNyArMTA4OCw3IEBAIHZvaWQgUmVuZGVyVGFi bGU6OnJlY2FsY1NlY3Rpb25zKCkgY29uc3QKICAgICAgICAgICAgIGlmIChpczxSZW5kZXJUYWJs ZVNlY3Rpb24+KCpjaGlsZCkpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJUYWJsZVNlY3Rpb24m IHNlY3Rpb24gPSBkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KCpjaGlsZCk7CiAgICAgICAg ICAgICAgICAgaWYgKCFtX2ZpcnN0Qm9keSkKLSAgICAgICAgICAgICAgICAgICAgbV9maXJzdEJv ZHkgPSAmc2VjdGlvbjsKKyAgICAgICAgICAgICAgICAgICAgbV9maXJzdEJvZHkgPSBtYWtlV2Vh a1B0cihzZWN0aW9uKTsKICAgICAgICAgICAgICAgICBzZWN0aW9uLnJlY2FsY0NlbGxzSWZOZWVk ZWQoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTM2Myw3ICsxMzU3 LDcgQEAgUmVuZGVyVGFibGVTZWN0aW9uKiBSZW5kZXJUYWJsZTo6c2VjdGlvbkFib3ZlKGNvbnN0 IFJlbmRlclRhYmxlU2VjdGlvbiogc2VjdGlvbiwKICAgICAgICAgcHJldlNlY3Rpb24gPSBwcmV2 U2VjdGlvbi0+cHJldmlvdXNTaWJsaW5nKCk7CiAgICAgfQogICAgIGlmICghcHJldlNlY3Rpb24g JiYgbV9oZWFkICYmIChza2lwRW1wdHlTZWN0aW9ucyA9PSBEb05vdFNraXBFbXB0eVNlY3Rpb25z IHx8IG1faGVhZC0+bnVtUm93cygpKSkKLSAgICAgICAgcHJldlNlY3Rpb24gPSBtX2hlYWQ7Cisg ICAgICAgIHByZXZTZWN0aW9uID0gbV9oZWFkLmdldCgpOwogICAgIHJldHVybiBkb3duY2FzdDxS ZW5kZXJUYWJsZVNlY3Rpb24+KHByZXZTZWN0aW9uKTsKIH0KIApAQCAtMTM4MSwyMiArMTM3NSwx OSBAQCBSZW5kZXJUYWJsZVNlY3Rpb24qIFJlbmRlclRhYmxlOjpzZWN0aW9uQmVsb3coY29uc3Qg UmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uLAogICAgICAgICBuZXh0U2VjdGlvbiA9IG5leHRT ZWN0aW9uLT5uZXh0U2libGluZygpOwogICAgIH0KICAgICBpZiAoIW5leHRTZWN0aW9uICYmIG1f Zm9vdCAmJiAoc2tpcEVtcHR5U2VjdGlvbnMgPT0gRG9Ob3RTa2lwRW1wdHlTZWN0aW9ucyB8fCBt X2Zvb3QtPm51bVJvd3MoKSkpCi0gICAgICAgIG5leHRTZWN0aW9uID0gbV9mb290OworICAgICAg ICBuZXh0U2VjdGlvbiA9IG1fZm9vdC5nZXQoKTsKICAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVy VGFibGVTZWN0aW9uPihuZXh0U2VjdGlvbik7CiB9CiAKIFJlbmRlclRhYmxlU2VjdGlvbiogUmVu ZGVyVGFibGU6OmJvdHRvbVNlY3Rpb24oKSBjb25zdAogewogICAgIHJlY2FsY1NlY3Rpb25zSWZO ZWVkZWQoKTsKLQogICAgIGlmIChtX2Zvb3QpCi0gICAgICAgIHJldHVybiBtX2Zvb3Q7Ci0KKyAg ICAgICAgcmV0dXJuIG1fZm9vdC5nZXQoKTsKICAgICBmb3IgKFJlbmRlck9iamVjdCogY2hpbGQg PSBsYXN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnByZXZpb3VzU2libGluZygpKSB7 CiAgICAgICAgIGlmIChpczxSZW5kZXJUYWJsZVNlY3Rpb24+KCpjaGlsZCkpCiAgICAgICAgICAg ICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyVGFibGVTZWN0aW9uPihjaGlsZCk7CiAgICAgfQotCiAg ICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl LmgKaW5kZXggM2M4YmRjNTFlMWM4YzA5Y2M4NjVjYzY1Yjc2NmM3NjU2Y2M0YzEwMi4uNjAzYjgx ZWM2ZjllZGNlOTViMGYxZWY0MGU1MmE2ZDUyN2IwMTZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRhYmxlLmgKQEAgLTE1Myw5ICsxNTMsOSBAQCBwdWJsaWM6CiAgICAgICAgIG1f Y29sdW1uUG9zW2luZGV4XSA9IHBvc2l0aW9uOwogICAgIH0KIAotICAgIFJlbmRlclRhYmxlU2Vj dGlvbiogaGVhZGVyKCkgY29uc3QgeyByZXR1cm4gbV9oZWFkOyB9Ci0gICAgUmVuZGVyVGFibGVT ZWN0aW9uKiBmb290ZXIoKSBjb25zdCB7IHJldHVybiBtX2Zvb3Q7IH0KLSAgICBSZW5kZXJUYWJs ZVNlY3Rpb24qIGZpcnN0Qm9keSgpIGNvbnN0IHsgcmV0dXJuIG1fZmlyc3RCb2R5OyB9CisgICAg UmVuZGVyVGFibGVTZWN0aW9uKiBoZWFkZXIoKSBjb25zdCB7IHJldHVybiBtX2hlYWQuZ2V0KCk7 IH0KKyAgICBSZW5kZXJUYWJsZVNlY3Rpb24qIGZvb3RlcigpIGNvbnN0IHsgcmV0dXJuIG1fZm9v dC5nZXQoKTsgfQorICAgIFJlbmRlclRhYmxlU2VjdGlvbiogZmlyc3RCb2R5KCkgY29uc3QgeyBy ZXR1cm4gbV9maXJzdEJvZHkuZ2V0KCk7IH0KIAogICAgIC8vIFRoaXMgZnVuY3Rpb24gcmV0dXJu cyAwIGlmIHRoZSB0YWJsZSBoYXMgbm8gc2VjdGlvbi4KICAgICBSZW5kZXJUYWJsZVNlY3Rpb24q IHRvcFNlY3Rpb24oKSBjb25zdDsKQEAgLTMzMiw5ICszMzIsOSBAQCBwcml2YXRlOgogICAgIHR5 cGVkZWYgSGFzaE1hcDxjb25zdCBSZW5kZXJUYWJsZUNvbCosIHVuc2lnbmVkPiBFZmZlY3RpdmVD b2x1bW5JbmRleE1hcDsKICAgICBtdXRhYmxlIEVmZmVjdGl2ZUNvbHVtbkluZGV4TWFwIG1fZWZm ZWN0aXZlQ29sdW1uSW5kZXhNYXA7CiAKLSAgICBtdXRhYmxlIFJlbmRlclRhYmxlU2VjdGlvbiog bV9oZWFkOwotICAgIG11dGFibGUgUmVuZGVyVGFibGVTZWN0aW9uKiBtX2Zvb3Q7Ci0gICAgbXV0 YWJsZSBSZW5kZXJUYWJsZVNlY3Rpb24qIG1fZmlyc3RCb2R5OworICAgIG11dGFibGUgV2Vha1B0 cjxSZW5kZXJUYWJsZVNlY3Rpb24+IG1faGVhZDsKKyAgICBtdXRhYmxlIFdlYWtQdHI8UmVuZGVy VGFibGVTZWN0aW9uPiBtX2Zvb3Q7CisgICAgbXV0YWJsZSBXZWFrUHRyPFJlbmRlclRhYmxlU2Vj dGlvbj4gbV9maXJzdEJvZHk7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8VGFibGVMYXlvdXQ+IG1f dGFibGVMYXlvdXQ7CiAKQEAgLTM3MiwxMCArMzcyLDEwIEBAIGlubGluZSBSZW5kZXJUYWJsZVNl Y3Rpb24qIFJlbmRlclRhYmxlOjp0b3BTZWN0aW9uKCkgY29uc3QKIHsKICAgICBBU1NFUlQoIW5l ZWRzU2VjdGlvblJlY2FsYygpKTsKICAgICBpZiAobV9oZWFkKQotICAgICAgICByZXR1cm4gbV9o ZWFkOworICAgICAgICByZXR1cm4gbV9oZWFkLmdldCgpOwogICAgIGlmIChtX2ZpcnN0Qm9keSkK LSAgICAgICAgcmV0dXJuIG1fZmlyc3RCb2R5OwotICAgIHJldHVybiBtX2Zvb3Q7CisgICAgICAg IHJldHVybiBtX2ZpcnN0Qm9keS5nZXQoKTsKKyAgICByZXR1cm4gbV9mb290LmdldCgpOwogfQog CiBpbmxpbmUgYm9vbCBpc0RpcmVjdGlvblNhbWUoY29uc3QgUmVuZGVyQm94KiB0YWJsZUl0ZW0s IGNvbnN0IFJlbmRlckJveCogb3RoZXJUYWJsZUl0ZW0pIHsgcmV0dXJuIHRhYmxlSXRlbSAmJiBv dGhlclRhYmxlSXRlbSA/IHRhYmxlSXRlbS0+c3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBvdGhlclRh YmxlSXRlbS0+c3R5bGUoKS5kaXJlY3Rpb24oKSA6IHRydWU7IH0K