68370 2011-09-19 10:18:39 -0700 Remove bump allocator 2011-09-19 10:40:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 469483 0 oliver 2011-09-19 10:18:39 -0700 Remove bump allocator 469485 1 107877 oliver 2011-09-19 10:20:49 -0700 Created attachment 107877 Patch 469500 2 oliver 2011-09-19 10:40:57 -0700 Committed r95439: <http://trac.webkit.org/changeset/95439> 107877 2011-09-19 10:20:49 -0700 2011-09-19 10:39:21 -0700 Patch bug-68370-20110919102048.patch text/plain 10097 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk0 Y2JmNTBmYTE5MDEyMGViNTdmZGI1ODAyYjMxOGEwYTY5YmFiOWYuLmJkYzU2NGU3OTcyN2FlYWIx ZWIwYjAwMjk5YzY0ODAzYzlkMWIyZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDMwIEBACisyMDExLTA5LTE5ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIGJ1bXAgYWxsb2NhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODM3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENhbid0IGRvIGFueXRoaW5nIHdpdGggdGhpcyBhbGxvY2F0 b3IgY3VycmVudGx5LCBhbmQgaXQncworICAgICAgICBpbmNyZWFzaW5nIHRoZSBjb21wbGV4aXR5 IG9mIHRoZSBHQyBjb2RlLiAgU2xpZ2h0IHByb2dyZXNzaW9uCisgICAgICAgIG9uIFN1blNwaWRl ciwgc2xpZ2h0IHJlZ3Jlc3Npb24gKHVuZG9pbmcgdGhlIG9yaWdpbmFsIHByb2dyZXNzaW9uKQor ICAgICAgICBpbiBWOC4KKworICAgICAgICAqIGhlYXAvSGVhcC5jcHA6CisgICAgICAgIChKU0M6 OkhlYXA6OmNvbGxlY3QpOgorICAgICAgICAqIGhlYXAvSGVhcC5oOgorICAgICAgICAqIGhlYXAv TmV3U3BhY2UuY3BwOgorICAgICAgICAoSlNDOjpOZXdTcGFjZTo6TmV3U3BhY2UpOgorICAgICAg ICAqIGhlYXAvTmV3U3BhY2UuaDoKKyAgICAgICAgKEpTQzo6TmV3U3BhY2U6OmFsbG9jYXRlKToK KyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6 OmFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKToKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0Lmg6 CisgICAgICAgIChKU0M6OkpTT2JqZWN0Ojp+SlNPYmplY3QpOgorICAgICAgICAoSlNDOjpKU09i amVjdDo6dmlzaXRDaGlsZHJlbkRpcmVjdCk6CisgICAgICAgICogcnVudGltZS9TdG9yYWdlQmFy cmllci5oOgorICAgICAgICAoSlNDOjpTdG9yYWdlQmFycmllcjo6c2V0KToKKwogMjAxMS0wOS0x OSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dUS10gRml4IGRpc3RjaGVjayBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvSGVhcC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcApp bmRleCBmNjQyZDI3YWI4NzMzMzVhYjNmNWEwMjlhMjVmM2RjM2U1NmY1OGFkLi40ZDJhYTBjMWNl MmE4ZGUyYWNlN2UzMDFjNDA4ZjFlMjZhZWQzZTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9IZWFwLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9I ZWFwLmNwcApAQCAtNjkyLDcgKzY5Miw2IEBAIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRvZ2ds ZSBzd2VlcFRvZ2dsZSkKICAgICAvLyBuZXcgYnl0ZXMgYWxsb2NhdGVkKSBwcm9wb3J0aW9uLCBh bmQgc2VlbXMgdG8gd29yayB3ZWxsIGluIGJlbmNobWFya3MuCiAgICAgc2l6ZV90IHByb3BvcnRp b25hbEJ5dGVzID0gMiAqIHNpemUoKTsKICAgICBtX25ld1NwYWNlLnNldEhpZ2hXYXRlck1hcmso bWF4KHByb3BvcnRpb25hbEJ5dGVzLCBtX21pbkJ5dGVzUGVyQ3ljbGUpKTsKLSAgICBtX25ld1Nw YWNlLnJlc2V0UHJvcGVydHlTdG9yYWdlTnVyc2VyeSgpOwogICAgIEpBVkFTQ1JJUFRDT1JFX0dD X0VORCgpOwogCiAgICAgKCptX2FjdGl2aXR5Q2FsbGJhY2spKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9IZWFwLmgKaW5kZXggZWY1ZTZkODZhYjBkNDM3OTBmNGUxN2Y1OGMzMmE2MGI2NjQ5NTE0ZC4u NTk0Yjc2NzQ4MzVjODZiNGZjMzE5Y2MxOTM5MDU2MjNiY2FiMzRlZiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL0hlYXAuaApAQCAtOTEsOSArOTEsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAg dm9pZCBub3RpZnlJc1NhZmVUb0NvbGxlY3QoKSB7IG1faXNTYWZlVG9Db2xsZWN0ID0gdHJ1ZTsg fQogICAgICAgICB2b2lkIGNvbGxlY3RBbGxHYXJiYWdlKCk7CiAKLSAgICAgICAgaW5saW5lIHZv aWQqIGFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKHNpemVfdCk7Ci0gICAgICAgIGlubGluZSBib29s IGluUHJvcGVydHlTdG9yYWdlTnVyc2VyeSh2b2lkKik7Ci0KICAgICAgICAgdm9pZCByZXBvcnRF eHRyYU1lbW9yeUNvc3Qoc2l6ZV90IGNvc3QpOwogCiAgICAgICAgIHZvaWQgcHJvdGVjdChKU1Zh bHVlKTsKQEAgLTM2MiwyMiArMzU5LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJldHVy biBhbGxvY2F0ZShzaXplQ2xhc3MpOwogICAgIH0KIAotICAgIGlubGluZSB2b2lkKiBIZWFwOjph bGxvY2F0ZVByb3BlcnR5U3RvcmFnZShzaXplX3QgYnl0ZXMpCi0gICAgewotICAgICAgICBBU1NF UlQoIShieXRlcyAlIHNpemVvZihKU1ZhbHVlKSkpOwotICAgICAgICBpZiAoYnl0ZXMgPj0gTmV3 U3BhY2U6OlByb3BlcnR5U3RvcmFnZU51cnNlcnlTaXplKQotICAgICAgICAgICAgcmV0dXJuIDA7 Ci0gICAgICAgIGlmICh2b2lkKiByZXN1bHQgPSBtX25ld1NwYWNlLmFsbG9jYXRlUHJvcGVydHlT dG9yYWdlKGJ5dGVzKSkKLSAgICAgICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgICAgIGNvbGxl Y3QoRG9Ob3RTd2VlcCk7Ci0gICAgICAgIHJldHVybiBtX25ld1NwYWNlLmFsbG9jYXRlUHJvcGVy dHlTdG9yYWdlKGJ5dGVzKTsKLSAgICB9Ci0gICAgCi0gICAgaW5saW5lIGJvb2wgSGVhcDo6aW5Q cm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5KHZvaWQqIHB0cikKLSAgICB7Ci0gICAgICAgIHJldHVybiBt X25ld1NwYWNlLmluUHJvcGVydHlTdG9yYWdlTnVyc2VyeShwdHIpOwotICAgIH0KLQogfSAvLyBu YW1lc3BhY2UgSlNDCiAKICNlbmRpZiAvLyBIZWFwX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL05ld1NwYWNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L05ld1NwYWNlLmNwcAppbmRleCA4NjYwODJkN2ZkZWNjZDgxOWI0YmEyNTZmYTVkNzRhNDBmNWNi MzA5Li4yZjE2Zjk5NmMyYmZmYjA2NWY0ZjY4ZDdmN2JhNmIzM2YyMTc0MTllIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9OZXdTcGFjZS5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvTmV3U3BhY2UuY3BwCkBAIC0zMiw5ICszMiw3IEBAIG5hbWVzcGFj ZSBKU0MgewogY2xhc3MgU3RydWN0dXJlOwogCiBOZXdTcGFjZTo6TmV3U3BhY2UoSGVhcCogaGVh cCkKLSAgICA6IG1fcHJvcGVydHlTdG9yYWdlTnVyc2VyeShzdGF0aWNfY2FzdDxjaGFyKj4oZmFz dE1hbGxvYyhQcm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5U2l6ZSkpKQotICAgICwgbV9wcm9wZXJ0eVN0 b3JhZ2VBbGxvY2F0aW9uUG9pbnQobV9wcm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5KQotICAgICwgbV93 YXRlck1hcmsoMCkKKyAgICA6IG1fd2F0ZXJNYXJrKDApCiAgICAgLCBtX2hpZ2hXYXRlck1hcmso MCkKICAgICAsIG1faGVhcChoZWFwKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvTmV3U3BhY2UuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL05ld1NwYWNl LmgKaW5kZXggZjIyZDc3MGE1N2UyODRjOTViNGE0MWYzZDNiNWJiZTE2ZTVmMjliNi4uOTBjZjg4 MTEyY2FmYzg4ZTY5NzY2OWJlOTUzNjJjZTZjM2Q1Yzk4YiAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvTmV3U3BhY2UuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9OZXdTcGFjZS5oCkBAIC00Niw3ICs0Niw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAg ICBXVEZfTUFLRV9OT05DT1BZQUJMRShOZXdTcGFjZSk7CiAgICAgcHVibGljOgogICAgICAgICBz dGF0aWMgY29uc3Qgc2l6ZV90IG1heENlbGxTaXplID0gMTAyNDsKLSAgICAgICAgc3RhdGljIGNv bnN0IHNpemVfdCBQcm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5U2l6ZSA9IDQgKiBNQjsKIAogICAgICAg ICBzdHJ1Y3QgU2l6ZUNsYXNzIHsKICAgICAgICAgICAgIFNpemVDbGFzcygpOwpAQCAtNjQsOSAr NjMsNiBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgICAgICBTaXplQ2xhc3MmIHNpemVDbGFzc0Zv cihzaXplX3QpOwogICAgICAgICB2b2lkKiBhbGxvY2F0ZShTaXplQ2xhc3MmKTsKLSAgICAgICAg aW5saW5lIHZvaWQqIGFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKHNpemVfdCk7Ci0gICAgICAgIGlu bGluZSBib29sIGluUHJvcGVydHlTdG9yYWdlTnVyc2VyeSh2b2lkKiBwdHIpOwotICAgICAgICBp bmxpbmUgdm9pZCByZXNldFByb3BlcnR5U3RvcmFnZU51cnNlcnkoKTsKICAgICAgICAgCiAgICAg ICAgIHZvaWQgcmVzZXRBbGxvY2F0b3IoKTsKIApAQCAtOTYsOCArOTIsNiBAQCBuYW1lc3BhY2Ug SlNDIHsKIAogICAgICAgICBTaXplQ2xhc3MgbV9wcmVjaXNlU2l6ZUNsYXNzZXNbcHJlY2lzZUNv dW50XTsKICAgICAgICAgU2l6ZUNsYXNzIG1faW1wcmVjaXNlU2l6ZUNsYXNzZXNbaW1wcmVjaXNl Q291bnRdOwotICAgICAgICBjaGFyKiBtX3Byb3BlcnR5U3RvcmFnZU51cnNlcnk7Ci0gICAgICAg IGNoYXIqIG1fcHJvcGVydHlTdG9yYWdlQWxsb2NhdGlvblBvaW50OwogICAgICAgICBzaXplX3Qg bV93YXRlck1hcms7CiAgICAgICAgIHNpemVfdCBtX2hpZ2hXYXRlck1hcms7CiAgICAgICAgIEhl YXAqIG1faGVhcDsKQEAgLTE2NiwzMCArMTYwLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IHNpemVDbGFzcy5maXJzdEZyZWVDZWxsID0gZmlyc3RGcmVlQ2VsbC0+bmV4dDsKICAgICAgICAg cmV0dXJuIGZpcnN0RnJlZUNlbGw7CiAgICAgfQotCi0gICAgaW5saW5lIHZvaWQgTmV3U3BhY2U6 OnJlc2V0UHJvcGVydHlTdG9yYWdlTnVyc2VyeSgpCi0gICAgewotICAgICAgICBtX3Byb3BlcnR5 U3RvcmFnZUFsbG9jYXRpb25Qb2ludCA9IG1fcHJvcGVydHlTdG9yYWdlTnVyc2VyeTsKLSAgICB9 Ci0gICAgCi0gICAgaW5saW5lIHZvaWQqIE5ld1NwYWNlOjphbGxvY2F0ZVByb3BlcnR5U3RvcmFn ZShzaXplX3Qgc2l6ZSkKLSAgICB7Ci0gICAgICAgIGNoYXIqIHJlc3VsdCA9IG1fcHJvcGVydHlT dG9yYWdlQWxsb2NhdGlvblBvaW50OwotICAgICAgICBpZiAoc2l6ZSA+IFByb3BlcnR5U3RvcmFn ZU51cnNlcnlTaXplKQotICAgICAgICAgICAgQ1JBU0goKTsKLSAgICAgICAgbV9wcm9wZXJ0eVN0 b3JhZ2VBbGxvY2F0aW9uUG9pbnQgKz0gc2l6ZTsKLSAgICAgICAgaWYgKHN0YXRpY19jYXN0PHNp emVfdD4obV9wcm9wZXJ0eVN0b3JhZ2VBbGxvY2F0aW9uUG9pbnQgLSBtX3Byb3BlcnR5U3RvcmFn ZU51cnNlcnkpID4gUHJvcGVydHlTdG9yYWdlTnVyc2VyeVNpemUpIHsKLSAgICAgICAgICAgIG1f cHJvcGVydHlTdG9yYWdlQWxsb2NhdGlvblBvaW50ID0gcmVzdWx0OwotICAgICAgICAgICAgcmV0 dXJuIDA7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICB9Ci0KLSAgICBp bmxpbmUgYm9vbCBOZXdTcGFjZTo6aW5Qcm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5KHZvaWQqIHB0cikK LSAgICB7Ci0gICAgICAgIGNoYXIqIGFkZHIgPSBzdGF0aWNfY2FzdDxjaGFyKj4ocHRyKTsKLSAg ICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PHNpemVfdD4oYWRkciAtIG1fcHJvcGVydHlTdG9yYWdl TnVyc2VyeSkgPCBQcm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5U2l6ZTsKLSAgICB9CiAgICAgCiAgICAg dGVtcGxhdGUgPHR5cGVuYW1lIEZ1bmN0b3I+IGlubGluZSB0eXBlbmFtZSBGdW5jdG9yOjpSZXR1 cm5UeXBlIE5ld1NwYWNlOjpmb3JFYWNoQmxvY2soRnVuY3RvciYgZnVuY3RvcikKICAgICB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKaW5kZXggMjI0MjY4YWY5 NjZhYThkYTQ0MDEwMDI2Y2ZmOWUzYzdhZjNhN2NiMC4uM2M2NWU0MmM4YTI2NDVhZjQyOTY5ODU4 YWNiOGQzY2I5ZjljZmYxMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2Jq ZWN0LmNwcApAQCAtNTk2LDE2ICs1OTYsNyBAQCB2b2lkIEpTT2JqZWN0OjphbGxvY2F0ZVByb3Bl cnR5U3RvcmFnZShKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIHNpemVfdCBvbGRTaXplLAogICAg IC8vIEl0J3MgaW1wb3J0YW50IHRoYXQgdGhpcyBmdW5jdGlvbiBub3QgcmVseSBvbiBtX3N0cnVj dHVyZSwgc2luY2UKICAgICAvLyB3ZSBtaWdodCBiZSBpbiB0aGUgbWlkZGxlIG9mIGEgdHJhbnNp dGlvbi4KICAgICBQcm9wZXJ0eVN0b3JhZ2UgbmV3UHJvcGVydHlTdG9yYWdlID0gMDsKLSAgICBp ZiAoZ2xvYmFsRGF0YS5oZWFwLmluUHJvcGVydHlTdG9yYWdlTnVyc2VyeShtX3Byb3BlcnR5U3Rv cmFnZS5nZXQoKSkpIHsKLSAgICAgICAgbmV3UHJvcGVydHlTdG9yYWdlID0gc3RhdGljX2Nhc3Q8 UHJvcGVydHlTdG9yYWdlPihnbG9iYWxEYXRhLmhlYXAuYWxsb2NhdGVQcm9wZXJ0eVN0b3JhZ2Uo bmV3U2l6ZSAqIHNpemVvZihXcml0ZUJhcnJpZXJCYXNlPFVua25vd24+KSkpOwotICAgICAgICBp ZiAoIW5ld1Byb3BlcnR5U3RvcmFnZSB8fCAhZ2xvYmFsRGF0YS5oZWFwLmluUHJvcGVydHlTdG9y YWdlTnVyc2VyeShtX3Byb3BlcnR5U3RvcmFnZS5nZXQoKSkpIHsKLSAgICAgICAgICAgIC8vIElm IGFsbG9jYXRpb24gZmFpbGVkIGJlY2F1c2UgaXQncyB0b28gYmlnLCBvciBpdCB0cmlnZ2VyZWQg YSBHQwotICAgICAgICAgICAgLy8gdGhhdCBwcm9tb3RlZCB1cyB0byBvbGQgc3BhY2UsIHdlIG5l ZWQgdG8gYWxsb2NhdGUgb3VyIHByb3BlcnR5Ci0gICAgICAgICAgICAvLyBzdG9yYWdlIGluIG9s ZCBzcGFjZS4KLSAgICAgICAgICAgIG5ld1Byb3BlcnR5U3RvcmFnZSA9IG5ldyBXcml0ZUJhcnJp ZXJCYXNlPFVua25vd24+W25ld1NpemVdOwotICAgICAgICB9Ci0gICAgfSBlbHNlCi0gICAgICAg IG5ld1Byb3BlcnR5U3RvcmFnZSA9IG5ldyBXcml0ZUJhcnJpZXJCYXNlPFVua25vd24+W25ld1Np emVdOworICAgIG5ld1Byb3BlcnR5U3RvcmFnZSA9IG5ldyBXcml0ZUJhcnJpZXJCYXNlPFVua25v d24+W25ld1NpemVdOwogCiAgICAgUHJvcGVydHlTdG9yYWdlIG9sZFByb3BlcnR5U3RvcmFnZSA9 IG1fcHJvcGVydHlTdG9yYWdlLmdldCgpOwogICAgIEFTU0VSVChuZXdQcm9wZXJ0eVN0b3JhZ2Up OwpAQCAtNjEzLDcgKzYwNCw3IEBAIHZvaWQgSlNPYmplY3Q6OmFsbG9jYXRlUHJvcGVydHlTdG9y YWdlKEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwgc2l6ZV90IG9sZFNpemUsCiAgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IG9sZFNpemU7ICsraSkKICAgICAgICBuZXdQcm9wZXJ0eVN0b3Jh Z2VbaV0gPSBvbGRQcm9wZXJ0eVN0b3JhZ2VbaV07CiAKLSAgICBpZiAoIWlzVXNpbmdJbmxpbmVT dG9yYWdlKCkgJiYgIWdsb2JhbERhdGEuaGVhcC5pblByb3BlcnR5U3RvcmFnZU51cnNlcnkobV9w cm9wZXJ0eVN0b3JhZ2UuZ2V0KCkpKQorICAgIGlmICghaXNVc2luZ0lubGluZVN0b3JhZ2UoKSkK ICAgICAgICAgZGVsZXRlIFtdIG9sZFByb3BlcnR5U3RvcmFnZTsKIAogICAgIG1fcHJvcGVydHlT dG9yYWdlLnNldChnbG9iYWxEYXRhLCB0aGlzLCBuZXdQcm9wZXJ0eVN0b3JhZ2UpOwpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKaW5kZXggNzc0ZWQ5NmRmNWM5ZDM1NjJl YTE1MDNkMDE5ZjZmNTYxNmE5OWJkMi4uYTQ3M2U4MDhhNTY2NDMwZmY2ZmI0YTg5NmE2YjJkODhl MzAxZDk4MyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmpl Y3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCkBAIC00 MzgsNyArNDM4LDcgQEAgaW5saW5lIEpTT2JqZWN0OjpKU09iamVjdChKU0dsb2JhbERhdGEmIGds b2JhbERhdGEsIFN0cnVjdHVyZSogc3RydWN0dXJlLCBQcm9wZXIKIAogaW5saW5lIEpTT2JqZWN0 Ojp+SlNPYmplY3QoKQogewotICAgIGlmICghaXNVc2luZ0lubGluZVN0b3JhZ2UoKSAmJiAhSGVh cDo6aGVhcCh0aGlzKS0+aW5Qcm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5KG1fcHJvcGVydHlTdG9yYWdl LmdldCgpKSkKKyAgICBpZiAoIWlzVXNpbmdJbmxpbmVTdG9yYWdlKCkpCiAgICAgICAgIGRlbGV0 ZSBbXSBtX3Byb3BlcnR5U3RvcmFnZS5nZXQoKTsKIH0KIApAQCAtODI2LDEyICs4MjYsNiBAQCBB TFdBWVNfSU5MSU5FIHZvaWQgSlNPYmplY3Q6OnZpc2l0Q2hpbGRyZW5EaXJlY3QoU2xvdFZpc2l0 b3ImIHZpc2l0b3IpCiAgICAgSlNDZWxsOjp2aXNpdENoaWxkcmVuKHZpc2l0b3IpOwogCiAgICAg UHJvcGVydHlTdG9yYWdlIHN0b3JhZ2UgPSBwcm9wZXJ0eVN0b3JhZ2UoKTsKLSAgICBpZiAoSGVh cDo6aGVhcCh0aGlzKS0+aW5Qcm9wZXJ0eVN0b3JhZ2VOdXJzZXJ5KHN0b3JhZ2UpKSB7Ci0gICAg ICAgIG1fcHJvcGVydHlTdG9yYWdlLnNldChuZXcgV3JpdGVCYXJyaWVyQmFzZTxVbmtub3duPltz dHJ1Y3R1cmUoKS0+cHJvcGVydHlTdG9yYWdlQ2FwYWNpdHkoKV0sIFN0b3JhZ2VCYXJyaWVyOjpV bmNoZWNrZWQpOwotICAgICAgICBpZiAoc3RydWN0dXJlKCktPnByb3BlcnR5U3RvcmFnZUNhcGFj aXR5KCkgPiBtX3N0cnVjdHVyZS0+cHJvcGVydHlTdG9yYWdlU2l6ZSgpKQotICAgICAgICAgICAg QVNTRVJUKCFzdG9yYWdlW21fc3RydWN0dXJlLT5wcm9wZXJ0eVN0b3JhZ2VTaXplKCldKTsKLSAg ICAgICAgbWVtY3B5KG1fcHJvcGVydHlTdG9yYWdlLmdldCgpLCBzdG9yYWdlLCBtX3N0cnVjdHVy ZS0+cHJvcGVydHlTdG9yYWdlU2l6ZSgpICogc2l6ZW9mKFdyaXRlQmFycmllckJhc2U8VW5rbm93 bj4pKTsKLSAgICB9CiAgICAgc2l6ZV90IHN0b3JhZ2VTaXplID0gbV9zdHJ1Y3R1cmUtPnByb3Bl cnR5U3RvcmFnZVNpemUoKTsKICAgICB2aXNpdG9yLmFwcGVuZFZhbHVlcyhzdG9yYWdlLCBzdG9y YWdlU2l6ZSk7CiAgICAgaWYgKG1faW5oZXJpdG9ySUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9TdG9yYWdlQmFycmllci5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvU3RvcmFnZUJhcnJpZXIuaAppbmRleCA5ZmM5NDZhZDhjNWE1MjIwMWJjODc1 ZTg2NWU3Mzc0ZWU0MjcwOTE1Li4yYTBjODQyYmFiYTc3NjIzMDgzNDk0NjQyYTBiNTU5OThjNDZm YWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdG9yYWdlQmFy cmllci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0b3JhZ2VCYXJyaWVy LmgKQEAgLTQ3LDEwICs0Nyw4IEBAIHB1YmxpYzoKICAgICAgICAgc2V0KHN0b3JhZ2UsIFVuY2hl Y2tlZCk7CiAgICAgfQogICAgIAotICAgIHZvaWQgc2V0KEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0 YSwgSlNDZWxsKiBvd25lciwgUHJvcGVydHlTdG9yYWdlIG5ld1N0b3JhZ2UpCisgICAgdm9pZCBz ZXQoSlNHbG9iYWxEYXRhJiwgSlNDZWxsKiwgUHJvcGVydHlTdG9yYWdlIG5ld1N0b3JhZ2UpCiAg ICAgewotICAgICAgICBpZiAoIWdsb2JhbERhdGEuaGVhcC5pblByb3BlcnR5U3RvcmFnZU51cnNl cnkobV9zdG9yYWdlKSkKLSAgICAgICAgICAgIGdsb2JhbERhdGEuaGVhcC53cml0ZUJhcnJpZXIo b3duZXIsIEpTVmFsdWUoKSk7CiAgICAgICAgIG1fc3RvcmFnZSA9IG5ld1N0b3JhZ2U7CiAgICAg fQogICAgIAo=