192575 2018-12-10 16:23:42 -0800 Use WeakPtr to refer to VTTCue in VTTCueBox 2018-12-10 19:14:24 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 192461 1 rniwa rniwa calvaris cdumez eric.carlson esprehn+autocc ews-watchlist gyuyoung.kim jeremyj-wk jer.noble philipj webkit-bug-importer oldest_to_newest 1486801 0 rniwa 2018-12-10 16:23:42 -0800 Use WeakPtr to address the fix me in ~VTTCue. 1486812 1 357015 rniwa 2018-12-10 16:39:06 -0800 Created attachment 357015 Cleanup 1486822 2 rniwa 2018-12-10 16:54:02 -0800 Thanks for the review! 1486849 3 rniwa 2018-12-10 19:05:30 -0800 Committed r239063: <https://trac.webkit.org/changeset/239063> 1486850 4 webkit-bug-importer 2018-12-10 19:06:26 -0800 <rdar://problem/46616570> 1486852 5 webkit-bug-importer 2018-12-10 19:14:24 -0800 <rdar://problem/46616700> 357015 2018-12-10 16:39:06 -0800 2018-12-10 16:48:24 -0800 Cleanup bug-192575-20181210163905.patch text/plain 10084 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzOTA2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTEyLTEwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFVzZSBXZWFrUHRyIHRvIHJlZmVy IHRvIFZUVEN1ZSBpbiBWVFRDdWVCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MjU3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHJlc3MgdGhlIEZJWE1FIGluIFZUVEN1ZTo6flZUVEN1ZSBieSBj bGVhcmluZyBWVFRDdWVCb3g6Om1fY3VlIHdoZW4gVlRUQ3VlIGdvZXMgYXdheS4KKyAgICAgICAg VGhpcyBpcyBpbXBsZW1lbnRlZCBieSBzaW1wbHkgdXNpbmcgV2Vha1B0ci4KKworICAgICAgICBO byBuZXcgdGVzdHMgc2luY2UgdGhlcmUgc2hvdWwgYmUgbm8gYmVoYWl2b3JhbCBjaGFuZ2UuCisK KyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1lbnQ6OmFwcGx5Q1NTUHJvcGVydGll cyk6CisgICAgICAgICogaHRtbC90cmFjay9WVFRDdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VlRUQ3VlQm94OjpWVFRDdWVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlQm94OjpnZXRD dWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlQm94OjphcHBseUNTU1Byb3BlcnRp ZXMpOgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlOjp+VlRUQ3VlKToKKyAgICAgICAgKiBodG1s L3RyYWNrL1ZUVEN1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlQm94Ojpmb250U2l6ZUZy b21DYXB0aW9uVXNlclByZWZzIGNvbnN0KToKKwogMjAxOC0xMi0xMCAgQW50dGkgS29pdmlzdG8g IDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lICJmb3JjZWQgc3R5bGUgcmVjYWxj IiB0byAiZnVsbCBzdHlsZSByZWJ1aWxkIgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFj ay9UZXh0VHJhY2tDdWVHZW5lcmljLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwCShyZXZpc2lvbiAyMzkwNTgpCisrKyBT b3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02OCwxMCArNjgsMTMgQEAgVGV4dFRyYWNrQ3VlR2VuZXJpY0JveEVsZW1lbnQ6 OlRleHRUcmFjawogCiB2b2lkIFRleHRUcmFja0N1ZUdlbmVyaWNCb3hFbGVtZW50OjphcHBseUNT U1Byb3BlcnRpZXMoY29uc3QgSW50U2l6ZSYgdmlkZW9TaXplKQogeworICAgIFJlZlB0cjxUZXh0 VHJhY2tDdWVHZW5lcmljPiBjdWUgPSBzdGF0aWNfY2FzdDxUZXh0VHJhY2tDdWVHZW5lcmljKj4o Z2V0Q3VlKCkpOworICAgIGlmICghY3VlKQorICAgICAgICByZXR1cm47CisKICAgICBzZXRJbmxp bmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UG9zaXRpb24sIENTU1ZhbHVlQWJzb2x1dGUpOwog ICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlVbmljb2RlQmlkaSwgQ1NTVmFs dWVQbGFpbnRleHQpOwotICAgIAotICAgIFJlZlB0cjxUZXh0VHJhY2tDdWVHZW5lcmljPiBjdWUg PSBzdGF0aWNfY2FzdDxUZXh0VHJhY2tDdWVHZW5lcmljKj4oZ2V0Q3VlKCkpOworCiAgICAgUmVm PEhUTUxTcGFuRWxlbWVudD4gY3VlRWxlbWVudCA9IGN1ZS0+ZWxlbWVudCgpOwogCiAgICAgZG91 YmxlIHRleHRQb3NpdGlvbiA9IGN1ZS0+Y2FsY3VsYXRlQ29tcHV0ZWRUZXh0UG9zaXRpb24oKTsK QEAgLTkyLDE2ICs5NSwxNiBAQCB2b2lkIFRleHRUcmFja0N1ZUdlbmVyaWNCb3hFbGVtZW50Ojph cHBsCiAgICAgICAgIGlmIChjdWUtPmZvbnRTaXplTXVsdGlwbGllcigpKQogICAgICAgICAgICAg YXV0aG9yRm9udFNpemUgKj0gY3VlLT5mb250U2l6ZU11bHRpcGxpZXIoKSAvIDEwMDsKIAotICAg ICAgICBkb3VibGUgbXVsdGlwbGllciA9IG1fZm9udFNpemVGcm9tQ2FwdGlvblVzZXJQcmVmcyAv IGF1dGhvckZvbnRTaXplOworICAgICAgICBkb3VibGUgbXVsdGlwbGllciA9IGZvbnRTaXplRnJv bUNhcHRpb25Vc2VyUHJlZnMoKSAvIGF1dGhvckZvbnRTaXplOwogICAgICAgICBkb3VibGUgbmV3 Q3VlU2l6ZSA9IHN0ZDo6bWluKHNpemUgKiBtdWx0aXBsaWVyLCAxMDAuMCk7CiAgICAgICAgIGlm IChjdWUtPmdldFdyaXRpbmdEaXJlY3Rpb24oKSA9PSBWVFRDdWU6Okhvcml6b250YWwpIHsKICAg ICAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlXaWR0aCwgbmV3Q3Vl U2l6ZSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKICAgICAgICAgICAgIGlm ICgoYWxpZ25tZW50ID09IENTU1ZhbHVlTWlkZGxlIHx8IGFsaWdubWVudCA9PSBDU1NWYWx1ZUNl bnRlcikgJiYgbXVsdGlwbGllciAhPSAxLjApCi0gICAgICAgICAgICAgICAgc2V0SW5saW5lU3R5 bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsIHN0YXRpY19jYXN0PGRvdWJsZT4odGV4dFBvc2l0 aW9uIC0gKG5ld0N1ZVNpemUgLSBtX2N1ZS5nZXRDU1NTaXplKCkpIC8gMiksIENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSk7CisgICAgICAgICAgICAgICAgc2V0SW5saW5lU3R5bGVQ cm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsIHN0YXRpY19jYXN0PGRvdWJsZT4odGV4dFBvc2l0aW9u IC0gKG5ld0N1ZVNpemUgLSBjdWUtPmdldENTU1NpemUoKSkgLyAyKSwgQ1NTUHJpbWl0aXZlVmFs dWU6OkNTU19QRVJDRU5UQUdFKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHNldElu bGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlIZWlnaHQsIG5ld0N1ZVNpemUsICBDU1NQcmlt aXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwogICAgICAgICAgICAgaWYgKChhbGlnbm1lbnQg PT0gQ1NTVmFsdWVNaWRkbGUgfHwgYWxpZ25tZW50ID09IENTU1ZhbHVlQ2VudGVyKSAmJiBtdWx0 aXBsaWVyICE9IDEuMCkKLSAgICAgICAgICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENT U1Byb3BlcnR5VG9wLCBzdGF0aWNfY2FzdDxkb3VibGU+KGN1ZS0+bGluZSgpIC0gKG5ld0N1ZVNp emUgLSBtX2N1ZS5nZXRDU1NTaXplKCkpIC8gMiksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVS Q0VOVEFHRSk7CisgICAgICAgICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9w ZXJ0eVRvcCwgc3RhdGljX2Nhc3Q8ZG91YmxlPihjdWUtPmxpbmUoKSAtIChuZXdDdWVTaXplIC0g Y3VlLT5nZXRDU1NTaXplKCkpIC8gMiksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFH RSk7CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2sv VlRUQ3VlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1 ZS5jcHAJKHJldmlzaW9uIDIzOTA1OCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRU Q3VlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDIwICsxMzMsMjUgQEAgUmVmPFZUVEN1ZUJv eD4gVlRUQ3VlQm94OjpjcmVhdGUoRG9jdW1lbgogCiBWVFRDdWVCb3g6OlZUVEN1ZUJveChEb2N1 bWVudCYgZG9jdW1lbnQsIFZUVEN1ZSYgY3VlKQogICAgIDogSFRNTEVsZW1lbnQoZGl2VGFnLCBk b2N1bWVudCkKLSAgICAsIG1fY3VlKGN1ZSkKKyAgICAsIG1fY3VlKG1ha2VXZWFrUHRyKGN1ZSkp CiB7CiAgICAgc2V0UHNldWRvKHZ0dEN1ZUJveFNoYWRvd1BzZXVkb0lkKCkpOwogfQogCiBWVFRD dWUqIFZUVEN1ZUJveDo6Z2V0Q3VlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gJm1fY3VlOworICAg IHJldHVybiBtX2N1ZS5nZXQoKTsKIH0KIAogdm9pZCBWVFRDdWVCb3g6OmFwcGx5Q1NTUHJvcGVy dGllcyhjb25zdCBJbnRTaXplJiB2aWRlb1NpemUpCiB7CisgICAgaWYgKCFtX2N1ZSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgYXV0byBjdWUgPSBtYWtlUmVmKCptX2N1ZSk7CisKICAgICAvLyBG SVhNRTogQXBwbHkgYWxsIHRoZSBpbml0aWFsIENTUyBwb3NpdGlvbmluZyBwcm9wZXJ0aWVzLiBo dHRwOi8vd2tiLnVnLzc5OTE2Ci0gICAgaWYgKCFtX2N1ZS5yZWdpb25JZCgpLmlzRW1wdHkoKSkg eworICAgIGlmICghY3VlLT5yZWdpb25JZCgpLmlzRW1wdHkoKSkgewogICAgICAgICBzZXRJbmxp bmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UG9zaXRpb24sIENTU1ZhbHVlUmVsYXRpdmUpOwog ICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTYwLDEyICsxNjUsMTIgQEAgdm9pZCBWVFRDdWVC b3g6OmFwcGx5Q1NTUHJvcGVydGllcyhjb25zdAogICAgIHNldElubGluZVN0eWxlUHJvcGVydHko Q1NTUHJvcGVydHlVbmljb2RlQmlkaSwgQ1NTVmFsdWVQbGFpbnRleHQpOwogCiAgICAgLy8gdGhl ICdkaXJlY3Rpb24nIHByb3BlcnR5IG11c3QgYmUgc2V0IHRvIGRpcmVjdGlvbgotICAgIHNldElu bGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlEaXJlY3Rpb24sIG1fY3VlLmdldENTU1dyaXRp bmdEaXJlY3Rpb24oKSk7CisgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eURp cmVjdGlvbiwgY3VlLT5nZXRDU1NXcml0aW5nRGlyZWN0aW9uKCkpOwogCiAgICAgLy8gdGhlICd3 cml0aW5nLW1vZGUnIHByb3BlcnR5IG11c3QgYmUgc2V0IHRvIHdyaXRpbmctbW9kZQotICAgIHNl dElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlXcml0aW5nTW9kZSwgbV9jdWUuZ2V0Q1NT V3JpdGluZ01vZGUoKSwgZmFsc2UpOworICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJv cGVydHlXcml0aW5nTW9kZSwgY3VlLT5nZXRDU1NXcml0aW5nTW9kZSgpLCBmYWxzZSk7CiAKLSAg ICBhdXRvIHBvc2l0aW9uID0gbV9jdWUuZ2V0Q1NTUG9zaXRpb24oKTsKKyAgICBhdXRvIHBvc2l0 aW9uID0gY3VlLT5nZXRDU1NQb3NpdGlvbigpOwogCiAgICAgLy8gdGhlICd0b3AnIHByb3BlcnR5 IG11c3QgYmUgc2V0IHRvIHRvcCwKICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3Bl cnR5VG9wLCBwb3NpdGlvbi5zZWNvbmQsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFH RSk7CkBAIC0xNzgsMzkgKzE4MywzOSBAQCB2b2lkIFZUVEN1ZUJveDo6YXBwbHlDU1NQcm9wZXJ0 aWVzKGNvbnN0CiAgICAgaWYgKGF1dGhvckZvbnRTaXplKQogICAgICAgICBtdWx0aXBsaWVyID0g bV9mb250U2l6ZUZyb21DYXB0aW9uVXNlclByZWZzIC8gYXV0aG9yRm9udFNpemU7CiAKLSAgICBk b3VibGUgdGV4dFBvc2l0aW9uID0gbV9jdWUuY2FsY3VsYXRlQ29tcHV0ZWRUZXh0UG9zaXRpb24o KTsKKyAgICBkb3VibGUgdGV4dFBvc2l0aW9uID0gY3VlLT5jYWxjdWxhdGVDb21wdXRlZFRleHRQ b3NpdGlvbigpOwogICAgIGRvdWJsZSBtYXhTaXplID0gMTAwLjA7Ci0gICAgQ1NTVmFsdWVJRCBh bGlnbm1lbnQgPSBtX2N1ZS5nZXRDU1NBbGlnbm1lbnQoKTsKKyAgICBDU1NWYWx1ZUlEIGFsaWdu bWVudCA9IGN1ZS0+Z2V0Q1NTQWxpZ25tZW50KCk7CiAgICAgaWYgKGFsaWdubWVudCA9PSBDU1NW YWx1ZUVuZCB8fCBhbGlnbm1lbnQgPT0gQ1NTVmFsdWVSaWdodCkKICAgICAgICAgbWF4U2l6ZSA9 IHRleHRQb3NpdGlvbjsKICAgICBlbHNlIGlmIChhbGlnbm1lbnQgPT0gQ1NTVmFsdWVTdGFydCB8 fCBhbGlnbm1lbnQgPT0gQ1NTVmFsdWVMZWZ0KQogICAgICAgICBtYXhTaXplID0gMTAwLjAgLSB0 ZXh0UG9zaXRpb247CiAKLSAgICBkb3VibGUgbmV3Q3VlU2l6ZSA9IHN0ZDo6bWluKG1fY3VlLmdl dENTU1NpemUoKSAqIG11bHRpcGxpZXIsIDEwMC4wKTsKKyAgICBkb3VibGUgbmV3Q3VlU2l6ZSA9 IHN0ZDo6bWluKGN1ZS0+Z2V0Q1NTU2l6ZSgpICogbXVsdGlwbGllciwgMTAwLjApOwogICAgIC8v IHRoZSAnd2lkdGgnIHByb3BlcnR5IG11c3QgYmUgc2V0IHRvIHdpZHRoLCBhbmQgdGhlICdoZWln aHQnIHByb3BlcnR5ICBtdXN0IGJlIHNldCB0byBoZWlnaHQKLSAgICBpZiAobV9jdWUudmVydGlj YWwoKSA9PSBob3Jpem9udGFsS2V5d29yZCgpKSB7CisgICAgaWYgKGN1ZS0+dmVydGljYWwoKSA9 PSBob3Jpem9udGFsS2V5d29yZCgpKSB7CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHko Q1NTUHJvcGVydHlXaWR0aCwgbmV3Q3VlU2l6ZSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJD RU5UQUdFKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdo dCwgQ1NTVmFsdWVBdXRvKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9w ZXJ0eU1pbldpZHRoLCAibWluLWNvbnRlbnQiKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eU1heFdpZHRoLCBtYXhTaXplLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NT X1BFUkNFTlRBR0UpOwogICAgICAgICBpZiAoKGFsaWdubWVudCA9PSBDU1NWYWx1ZU1pZGRsZSB8 fCBhbGlnbm1lbnQgPT0gQ1NTVmFsdWVDZW50ZXIpICYmIG11bHRpcGxpZXIgIT0gMS4wKQotICAg ICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsIHN0YXRpY19j YXN0PGRvdWJsZT4ocG9zaXRpb24uZmlyc3QgLSAobmV3Q3VlU2l6ZSAtIG1fY3VlLmdldENTU1Np emUoKSkgLyAyKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKKyAgICAgICAg ICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlMZWZ0LCBzdGF0aWNfY2FzdDxk b3VibGU+KHBvc2l0aW9uLmZpcnN0IC0gKG5ld0N1ZVNpemUgLSBjdWUtPmdldENTU1NpemUoKSkg LyAyKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKICAgICB9IGVsc2Ugewog ICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5V2lkdGgsIENTU1ZhbHVl QXV0byk7CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlIZWlnaHQs IG5ld0N1ZVNpemUsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSk7CiAgICAgICAg IHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlNaW5IZWlnaHQsICJtaW4tY29udGVu dCIpOwogICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5TWF4SGVpZ2h0 LCBtYXhTaXplLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpOwogICAgICAgICBp ZiAoKGFsaWdubWVudCA9PSBDU1NWYWx1ZU1pZGRsZSB8fCBhbGlnbm1lbnQgPT0gQ1NTVmFsdWVD ZW50ZXIpICYmIG11bHRpcGxpZXIgIT0gMS4wKQotICAgICAgICAgICAgc2V0SW5saW5lU3R5bGVQ cm9wZXJ0eShDU1NQcm9wZXJ0eVRvcCwgc3RhdGljX2Nhc3Q8ZG91YmxlPihwb3NpdGlvbi5zZWNv bmQgLSAobmV3Q3VlU2l6ZSAtIG1fY3VlLmdldENTU1NpemUoKSkgLyAyKSwgQ1NTUHJpbWl0aXZl VmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKKyAgICAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVy dHkoQ1NTUHJvcGVydHlUb3AsIHN0YXRpY19jYXN0PGRvdWJsZT4ocG9zaXRpb24uc2Vjb25kIC0g KG5ld0N1ZVNpemUgLSBjdWUtPmdldENTU1NpemUoKSkgLyAyKSwgQ1NTUHJpbWl0aXZlVmFsdWU6 OkNTU19QRVJDRU5UQUdFKTsKICAgICB9CiAKICAgICAvLyBUaGUgJ3RleHQtYWxpZ24nIHByb3Bl cnR5IG9uIHRoZSAocm9vdCkgTGlzdCBvZiBXZWJWVFQgTm9kZSBPYmplY3RzIG11c3QKICAgICAv LyBiZSBzZXQgdG8gdGhlIHZhbHVlIGluIHRoZSBzZWNvbmQgY2VsbCBvZiB0aGUgcm93IG9mIHRo ZSB0YWJsZSBiZWxvdwogICAgIC8vIHdob3NlIGZpcnN0IGNlbGwgaXMgdGhlIHZhbHVlIG9mIHRo ZSBjb3JyZXNwb25kaW5nIGN1ZSdzIHRleHQgdHJhY2sgY3VlCiAgICAgLy8gYWxpZ25tZW50Ogot ICAgIHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlUZXh0QWxpZ24sIG1fY3VlLmdl dENTU0FsaWdubWVudCgpKTsKKyAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5 VGV4dEFsaWduLCBjdWUtPmdldENTU0FsaWdubWVudCgpKTsKICAgICAKLSAgICBpZiAoIW1fY3Vl LnNuYXBUb0xpbmVzKCkpIHsKKyAgICBpZiAoIWN1ZS0+c25hcFRvTGluZXMoKSkgewogICAgICAg ICAvLyAxMC4xMy4xIFNldCB1cCB4IGFuZCB5OgogICAgICAgICAvLyBOb3RlOiB4IGFuZCB5IGFy ZSBzZXQgdGhyb3VnaCB0aGUgQ1NTIGxlZnQgYW5kIHRvcCBhYm92ZS4KIApAQCAtMjI5LDcgKzIz NCw3IEBAIHZvaWQgVlRUQ3VlQm94OjphcHBseUNTU1Byb3BlcnRpZXMoY29uc3QKIAogICAgIC8v IE1ha2Ugc3VyZSBzaGFkb3cgb3Igc3Ryb2tlIGlzIG5vdCBjbGlwcGVkLgogICAgIHNldElubGlu ZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlPdmVyZmxvdywgQ1NTVmFsdWVWaXNpYmxlKTsKLSAg ICBtX2N1ZS5lbGVtZW50KCkuc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU92ZXJm bG93LCBDU1NWYWx1ZVZpc2libGUpOworICAgIGN1ZS0+ZWxlbWVudCgpLnNldElubGluZVN0eWxl UHJvcGVydHkoQ1NTUHJvcGVydHlPdmVyZmxvdywgQ1NTVmFsdWVWaXNpYmxlKTsKIH0KIAogY29u c3QgQXRvbWljU3RyaW5nJiBWVFRDdWVCb3g6OnZ0dEN1ZUJveFNoYWRvd1BzZXVkb0lkKCkKQEAg LTI3Nyw5ICsyODIsNiBAQCBWVFRDdWU6OlZUVEN1ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBj CiAKIFZUVEN1ZTo6flZUVEN1ZSgpCiB7Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBzZXQgbV9j dWUgaW4gVlRUQ3VlQm94IHRvIG51bGxwdHIgaW5zdGVhZC4KLSAgICBpZiAobV9kaXNwbGF5VHJl ZSAmJiBtX2Rpc3BsYXlUcmVlLT5kb2N1bWVudCgpLnJlZkNvdW50KCkpCi0gICAgICAgIG1fZGlz cGxheVRyZWUtPnJlbW92ZSgpOwogfQogCiB2b2lkIFZUVEN1ZTo6aW5pdGlhbGl6ZShTY3JpcHRF eGVjdXRpb25Db250ZXh0JiBjb250ZXh0KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFj ay9WVFRDdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1 ZS5oCShyZXZpc2lvbiAyMzkwNTgpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1 ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCwxMyArNjQsMTYgQEAgcHJvdGVjdGVkOgogCiAgICAg UmVuZGVyUHRyPFJlbmRlckVsZW1lbnQ+IGNyZWF0ZUVsZW1lbnRSZW5kZXJlcihSZW5kZXJTdHls ZSYmLCBjb25zdCBSZW5kZXJUcmVlUG9zaXRpb24mKSBmaW5hbDsKIAotICAgIFZUVEN1ZSYgbV9j dWU7CisgICAgaW50IGZvbnRTaXplRnJvbUNhcHRpb25Vc2VyUHJlZnMoKSBjb25zdCB7IHJldHVy biBtX2ZvbnRTaXplRnJvbUNhcHRpb25Vc2VyUHJlZnM7IH0KKworcHJpdmF0ZToKKyAgICBXZWFr UHRyPFZUVEN1ZT4gbV9jdWU7CiAgICAgaW50IG1fZm9udFNpemVGcm9tQ2FwdGlvblVzZXJQcmVm czsKIH07CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotY2xhc3MgVlRUQ3Vl IDogcHVibGljIFRleHRUcmFja0N1ZSB7CitjbGFzcyBWVFRDdWUgOiBwdWJsaWMgVGV4dFRyYWNr Q3VlLCBwdWJsaWMgQ2FuTWFrZVdlYWtQdHI8VlRUQ3VlPiB7CiBwdWJsaWM6CiAgICAgc3RhdGlj IFJlZjxWVFRDdWU+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBkb3Vi bGUgc3RhcnQsIGRvdWJsZSBlbmQsIGNvbnN0IFN0cmluZyYgY29udGVudCkKICAgICB7Cg==