140687 2015-01-20 11:10:44 -0800 bmalloc: a little bit of cleanup 2015-01-20 11:29:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 1062807 0 ggaren 2015-01-20 11:10:44 -0800 bmalloc: a little bit of cleanup 1062818 1 245003 ggaren 2015-01-20 11:13:37 -0800 Created attachment 245003 Patch 1062825 2 ggaren 2015-01-20 11:29:40 -0800 Committed r178727: <http://trac.webkit.org/changeset/178727> 245003 2015-01-20 11:13:37 -0800 2015-01-20 11:26:52 -0800 Patch bug-140687-20150120111344.patch text/plain 10551 ggaren SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3ODcyNCkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQzIEBACisyMDE1LTAxLTIwICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgYm1hbGxvYzogYSBsaXR0bGUg Yml0IG9mIGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0MDY4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogYm1hbGxvYy9BbGdvcml0aG0uaDoKKyAgICAgICAgKGJtYWxsb2M6OmlzUG93ZXJP ZlR3byk6IEFkZGVkIGEgY2hlY2sgZm9yIDAsIHNpbmNlIDAgd291bGQgYnJlYWsgYSBsb3QKKyAg ICAgICAgb2YgY29kZS4KKworICAgICAgICAqIGJtYWxsb2MvQm91bmRhcnlUYWcuaDoKKyAgICAg ICAgKiBibWFsbG9jL0JvdW5kYXJ5VGFnSW5saW5lcy5oOgorICAgICAgICAoYm1hbGxvYzo6Qm91 bmRhcnlUYWc6Om1lcmdlTGVmdCk6CisgICAgICAgIChibWFsbG9jOjpCb3VuZGFyeVRhZzo6bWVy Z2VSaWdodCk6CisgICAgICAgIChibWFsbG9jOjpCb3VuZGFyeVRhZzo6bWVyZ2UpOgorICAgICAg ICAoYm1hbGxvYzo6Qm91bmRhcnlUYWc6OmRlYWxsb2NhdGUpOgorICAgICAgICAoYm1hbGxvYzo6 Qm91bmRhcnlUYWc6OnNwbGl0KToKKyAgICAgICAgKGJtYWxsb2M6OkJvdW5kYXJ5VGFnOjphbGxv Y2F0ZSk6CisgICAgICAgIChibWFsbG9jOjpCb3VuZGFyeVRhZzo6bWVyZ2VMYXJnZUxlZnQpOiBE ZWxldGVkLgorICAgICAgICAoYm1hbGxvYzo6Qm91bmRhcnlUYWc6Om1lcmdlTGFyZ2VSaWdodCk6 IERlbGV0ZWQuCisgICAgICAgIChibWFsbG9jOjpCb3VuZGFyeVRhZzo6bWVyZ2VMYXJnZSk6IERl bGV0ZWQuCisgICAgICAgIChibWFsbG9jOjpCb3VuZGFyeVRhZzo6c3BsaXRMYXJnZSk6IERlbGV0 ZWQuIFJlbW92ZWQgdGhlIHdvcmQgIkxhcmdlIgorICAgICAgICBmcm9tIGFsbCB0aGVzZSBmdW5j dGlvbnMsIHNpbmNlIGJvdW5kYXJ5IHRhZ3MgYWx3YXlzIHBlcnRhaW4gdG8gbGFyZ2UKKyAgICAg ICAgb2JqZWN0cywgYW5kIHB1dHRpbmcgdGhlIHdvcmQgIkxhcmdlIiBldmVyeXdoZXJlIHdhc24n dCBoZWxwaW5nIHRvCisgICAgICAgIGV4cGxhaW4gdGhhdC4KKworICAgICAgICAqIGJtYWxsb2Mv SGVhcC5jcHA6CisgICAgICAgIChibWFsbG9jOjpIZWFwOjphbGxvY2F0ZVhMYXJnZSk6CisgICAg ICAgIChibWFsbG9jOjpIZWFwOjpmaW5kWExhcmdlKToKKyAgICAgICAgKGJtYWxsb2M6OkhlYXA6 OmRlYWxsb2NhdGVYTGFyZ2UpOgorICAgICAgICAqIGJtYWxsb2MvSGVhcC5oOgorICAgICAgICAq IGJtYWxsb2MvVk1IZWFwLmg6CisgICAgICAgIChibWFsbG9jOjpWTUhlYXA6OmFsbG9jYXRlWExh cmdlKTogRGVsZXRlZC4KKyAgICAgICAgKGJtYWxsb2M6OlZNSGVhcDo6ZmluZFhMYXJnZSk6IERl bGV0ZWQuCisgICAgICAgIChibWFsbG9jOjpWTUhlYXA6OmRlYWxsb2NhdGVYTGFyZ2UpOiBEZWxl dGVkLiBNb3ZlZCBYTGFyZ2UgYWxsb2NhdGlvbgorICAgICAgICBmcm9tIFZNSGVhcCB0byBIZWFw LiBTaW5jZSB0aGUgcHVycG9zZSBvZiB0aGUgVk1IZWFwIGlzIHRvIGNhY2hlIFZNCisgICAgICAg IHJhbmdlcywgYW5kIHRoZSBWTUhlYXAgbmV2ZXIgY2FjaGVzIGFueSBYTGFyZ2UgcmFuZ2VzLCBp dCBkb2Vzbid0CisgICAgICAgIHJlYWxseSBtYWtlIHNlbnNlIGZvciB0aGUgVk1IZWFwIHRvIGJl IGludm9sdmVkLgorCiAyMDE1LTAxLTE2ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5j b20+CiAKICAgICAgICAgYm1hbGxvYzogcmVmYWN0b3JlZCBYTGFyZ2UgYWxsb2NhdGlvbiBmb3Ig YmV0dGVyIGFsaWdubWVudApJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BbGdvcml0aG0u aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oCShyZXZp c2lvbiAxNzg2NzcpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsZ29yaXRobS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC02NCw3ICs2NCw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGlubGluZSBj b25zdGV4cHIgYm8KIAogaW5saW5lIGNvbnN0ZXhwciBib29sIGlzUG93ZXJPZlR3byhzaXplX3Qg c2l6ZSkKIHsKLSAgICByZXR1cm4gIShzaXplICYgKHNpemUgLSAxKSk7CisgICAgcmV0dXJuIHNp emUgJiYgIShzaXplICYgKHNpemUgLSAxKSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGlu bGluZSBUIHJvdW5kVXBUb011bHRpcGxlT2Yoc2l6ZV90IGRpdmlzb3IsIFQgeCkKSW5kZXg6IFNv dXJjZS9ibWFsbG9jL2JtYWxsb2MvQm91bmRhcnlUYWcuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv Ym1hbGxvYy9ibWFsbG9jL0JvdW5kYXJ5VGFnLmgJKHJldmlzaW9uIDE3ODY3NykKKysrIFNvdXJj ZS9ibWFsbG9jL2JtYWxsb2MvQm91bmRhcnlUYWcuaAkod29ya2luZyBjb3B5KQpAQCAtNzIsMTAg KzcyLDEwIEBAIHByaXZhdGU6CiAgICAgc3RhdGljX2Fzc2VydCgoMSA8PCBjb21wYWN0QmVnaW5C aXRzKSAtIDEgPj0gbGFyZ2VNaW4gLyBsYXJnZUFsaWdubWVudCwgImNvbXBhY3RCZWdpbiBtdXN0 IGJlIGVuY29kYWJsZSBpbiBhIEJvdW5kYXJ5VGFnLiIpOwogICAgIHN0YXRpY19hc3NlcnQoKDEg PDwgc2l6ZUJpdHMpIC0gMSA+PSBsYXJnZU1heCwgImxhcmdlTWF4IG11c3QgYmUgZW5jb2RhYmxl IGluIGEgQm91bmRhcnlUYWcuIik7CiAKLSAgICBzdGF0aWMgdm9pZCBzcGxpdExhcmdlKEJlZ2lu VGFnKiwgc2l6ZV90IHNpemUsIEVuZFRhZyomIGVuZFRhZywgUmFuZ2UmLCBSYW5nZSYgbGVmdG92 ZXIpOwotICAgIHN0YXRpYyB2b2lkIG1lcmdlTGFyZ2VMZWZ0KEVuZFRhZyomIHByZXYsIEJlZ2lu VGFnKiYgYmVnaW5UYWcsIFJhbmdlJiwgYm9vbCYgaGFzUGh5c2ljYWxQYWdlcyk7Ci0gICAgc3Rh dGljIHZvaWQgbWVyZ2VMYXJnZVJpZ2h0KEVuZFRhZyomLCBCZWdpblRhZyomIG5leHQsIFJhbmdl JiwgYm9vbCYgaGFzUGh5c2ljYWxQYWdlcyk7Ci0gICAgc3RhdGljIHZvaWQgbWVyZ2VMYXJnZShC ZWdpblRhZyomLCBFbmRUYWcqJiwgUmFuZ2UmKTsKKyAgICBzdGF0aWMgdm9pZCBzcGxpdChCZWdp blRhZyosIHNpemVfdCwgRW5kVGFnKiYsIFJhbmdlJiwgUmFuZ2UmIGxlZnRvdmVyKTsKKyAgICBz dGF0aWMgdm9pZCBtZXJnZUxlZnQoRW5kVGFnKiYgcHJldiwgQmVnaW5UYWcqJiwgUmFuZ2UmLCBi b29sJiBoYXNQaHlzaWNhbFBhZ2VzKTsKKyAgICBzdGF0aWMgdm9pZCBtZXJnZVJpZ2h0KEVuZFRh ZyomLCBCZWdpblRhZyomIG5leHQsIFJhbmdlJiwgYm9vbCYgaGFzUGh5c2ljYWxQYWdlcyk7Cisg ICAgc3RhdGljIHZvaWQgbWVyZ2UoQmVnaW5UYWcqJiwgRW5kVGFnKiYsIFJhbmdlJik7CiAKICAg ICBib29sIG1faXNGcmVlOiAxOwogICAgIGJvb2wgbV9pc0VuZDogMTsKSW5kZXg6IFNvdXJjZS9i bWFsbG9jL2JtYWxsb2MvQm91bmRhcnlUYWdJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L2JtYWxsb2MvYm1hbGxvYy9Cb3VuZGFyeVRhZ0lubGluZXMuaAkocmV2aXNpb24gMTc4Njc3KQor KysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Cb3VuZGFyeVRhZ0lubGluZXMuaAkod29ya2luZyBj b3B5KQpAQCAtMTA1LDcgKzEwNSw3IEBAIGlubGluZSBSYW5nZSBCb3VuZGFyeVRhZzo6aW5pdChM YXJnZUNodW4KICAgICByZXR1cm4gcmFuZ2U7CiB9CiAKLWlubGluZSB2b2lkIEJvdW5kYXJ5VGFn OjptZXJnZUxhcmdlTGVmdChFbmRUYWcqJiBwcmV2LCBCZWdpblRhZyomIGJlZ2luVGFnLCBSYW5n ZSYgcmFuZ2UsIGJvb2wmIGhhc1BoeXNpY2FsUGFnZXMpCitpbmxpbmUgdm9pZCBCb3VuZGFyeVRh Zzo6bWVyZ2VMZWZ0KEVuZFRhZyomIHByZXYsIEJlZ2luVGFnKiYgYmVnaW5UYWcsIFJhbmdlJiBy YW5nZSwgYm9vbCYgaGFzUGh5c2ljYWxQYWdlcykKIHsKICAgICBSYW5nZSBsZWZ0KHJhbmdlLmJl Z2luKCkgLSBwcmV2LT5zaXplKCksIHByZXYtPnNpemUoKSk7CiAKQEAgLTExOSw3ICsxMTksNyBA QCBpbmxpbmUgdm9pZCBCb3VuZGFyeVRhZzo6bWVyZ2VMYXJnZUxlZnQoCiAgICAgYmVnaW5UYWcg PSBMYXJnZUNodW5rOjpiZWdpblRhZyhyYW5nZS5iZWdpbigpKTsKIH0KIAotaW5saW5lIHZvaWQg Qm91bmRhcnlUYWc6Om1lcmdlTGFyZ2VSaWdodChFbmRUYWcqJiBlbmRUYWcsIEJlZ2luVGFnKiYg bmV4dCwgUmFuZ2UmIHJhbmdlLCBib29sJiBoYXNQaHlzaWNhbFBhZ2VzKQoraW5saW5lIHZvaWQg Qm91bmRhcnlUYWc6Om1lcmdlUmlnaHQoRW5kVGFnKiYgZW5kVGFnLCBCZWdpblRhZyomIG5leHQs IFJhbmdlJiByYW5nZSwgYm9vbCYgaGFzUGh5c2ljYWxQYWdlcykKIHsKICAgICBSYW5nZSByaWdo dChyYW5nZS5lbmQoKSwgbmV4dC0+c2l6ZSgpKTsKIApAQCAtMTMzLDcgKzEzMyw3IEBAIGlubGlu ZSB2b2lkIEJvdW5kYXJ5VGFnOjptZXJnZUxhcmdlUmlnaHQKICAgICBlbmRUYWcgPSBMYXJnZUNo dW5rOjplbmRUYWcocmFuZ2UuYmVnaW4oKSwgcmFuZ2Uuc2l6ZSgpKTsKIH0KIAotSU5MSU5FIHZv aWQgQm91bmRhcnlUYWc6Om1lcmdlTGFyZ2UoQmVnaW5UYWcqJiBiZWdpblRhZywgRW5kVGFnKiYg ZW5kVGFnLCBSYW5nZSYgcmFuZ2UpCitJTkxJTkUgdm9pZCBCb3VuZGFyeVRhZzo6bWVyZ2UoQmVn aW5UYWcqJiBiZWdpblRhZywgRW5kVGFnKiYgZW5kVGFnLCBSYW5nZSYgcmFuZ2UpCiB7CiAgICAg RW5kVGFnKiBwcmV2ID0gYmVnaW5UYWctPnByZXYoKTsKICAgICBCZWdpblRhZyogbmV4dCA9IGVu ZFRhZy0+bmV4dCgpOwpAQCAtMTQyLDEwICsxNDIsMTAgQEAgSU5MSU5FIHZvaWQgQm91bmRhcnlU YWc6Om1lcmdlTGFyZ2UoQmVnaQogICAgIHZhbGlkYXRlKHByZXYsIHJhbmdlLCBuZXh0KTsKIAog ICAgIGlmIChwcmV2LT5pc0ZyZWUoKSkKLSAgICAgICAgbWVyZ2VMYXJnZUxlZnQocHJldiwgYmVn aW5UYWcsIHJhbmdlLCBoYXNQaHlzaWNhbFBhZ2VzKTsKKyAgICAgICAgbWVyZ2VMZWZ0KHByZXYs IGJlZ2luVGFnLCByYW5nZSwgaGFzUGh5c2ljYWxQYWdlcyk7CiAKICAgICBpZiAobmV4dC0+aXNG cmVlKCkpCi0gICAgICAgIG1lcmdlTGFyZ2VSaWdodChlbmRUYWcsIG5leHQsIHJhbmdlLCBoYXNQ aHlzaWNhbFBhZ2VzKTsKKyAgICAgICAgbWVyZ2VSaWdodChlbmRUYWcsIG5leHQsIHJhbmdlLCBo YXNQaHlzaWNhbFBhZ2VzKTsKIAogICAgIGJlZ2luVGFnLT5zZXRSYW5nZShyYW5nZSk7CiAgICAg YmVnaW5UYWctPnNldEZyZWUodHJ1ZSk7CkBAIC0xNjQsMTIgKzE2NCwxMiBAQCBpbmxpbmUgUmFu Z2UgQm91bmRhcnlUYWc6OmRlYWxsb2NhdGUodm9pCiAKICAgICBSYW5nZSByYW5nZShvYmplY3Qs IGJlZ2luVGFnLT5zaXplKCkpOwogICAgIEVuZFRhZyogZW5kVGFnID0gTGFyZ2VDaHVuazo6ZW5k VGFnKHJhbmdlLmJlZ2luKCksIHJhbmdlLnNpemUoKSk7Ci0gICAgbWVyZ2VMYXJnZShiZWdpblRh ZywgZW5kVGFnLCByYW5nZSk7CisgICAgbWVyZ2UoYmVnaW5UYWcsIGVuZFRhZywgcmFuZ2UpOwog ICAgIAogICAgIHJldHVybiByYW5nZTsKIH0KIAotSU5MSU5FIHZvaWQgQm91bmRhcnlUYWc6OnNw bGl0TGFyZ2UoQmVnaW5UYWcqIGJlZ2luVGFnLCBzaXplX3Qgc2l6ZSwgRW5kVGFnKiYgZW5kVGFn LCBSYW5nZSYgcmFuZ2UsIFJhbmdlJiBsZWZ0b3ZlcikKK0lOTElORSB2b2lkIEJvdW5kYXJ5VGFn OjpzcGxpdChCZWdpblRhZyogYmVnaW5UYWcsIHNpemVfdCBzaXplLCBFbmRUYWcqJiBlbmRUYWcs IFJhbmdlJiByYW5nZSwgUmFuZ2UmIGxlZnRvdmVyKQogewogICAgIGxlZnRvdmVyID0gUmFuZ2Uo cmFuZ2UuYmVnaW4oKSArIHNpemUsIHJhbmdlLnNpemUoKSAtIHNpemUpOwogICAgIHJhbmdlID0g UmFuZ2UocmFuZ2UuYmVnaW4oKSwgc2l6ZSk7CkBAIC0yMDMsNyArMjAzLDcgQEAgSU5MSU5FIHZv aWQgQm91bmRhcnlUYWc6OmFsbG9jYXRlKHNpemVfdAogICAgIHZhbGlkYXRlKGJlZ2luVGFnLT5w cmV2KCksIHJhbmdlLCBlbmRUYWctPm5leHQoKSk7CiAKICAgICBpZiAocmFuZ2Uuc2l6ZSgpIC0g c2l6ZSA+IGxhcmdlTWluKQotICAgICAgICBzcGxpdExhcmdlKGJlZ2luVGFnLCBzaXplLCBlbmRU YWcsIHJhbmdlLCBsZWZ0b3Zlcik7CisgICAgICAgIHNwbGl0KGJlZ2luVGFnLCBzaXplLCBlbmRU YWcsIHJhbmdlLCBsZWZ0b3Zlcik7CiAKICAgICBoYXNQaHlzaWNhbFBhZ2VzID0gYmVnaW5UYWct Pmhhc1BoeXNpY2FsUGFnZXMoKTsKIApJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFw LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuY3BwCShyZXZp c2lvbiAxNzg2NzcpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMTksMjMgKzMxOSw0MCBAQCB2b2lkIEhlYXA6OmRlYWxsb2NhdGVNZWRpdW1M aW5lKHN0ZDo6bG9jCiAgICAgfQogfQogCi1SYW5nZSBIZWFwOjpmaW5kWExhcmdlKHN0ZDo6bG9j a19ndWFyZDxTdGF0aWNNdXRleD4mLCB2b2lkKiBvYmplY3QpCi17Ci0gICAgcmV0dXJuIG1fdm1I ZWFwLmZpbmRYTGFyZ2Uob2JqZWN0KTsKLX0KLQogdm9pZCogSGVhcDo6YWxsb2NhdGVYTGFyZ2Uo c3RkOjpsb2NrX2d1YXJkPFN0YXRpY011dGV4PiYsIHNpemVfdCBzaXplKQogewogICAgIG1faXNB bGxvY2F0aW5nUGFnZXMgPSB0cnVlOwogCi0gICAgdm9pZCogcmVzdWx0ID0gbV92bUhlYXAuYWxs b2NhdGVYTGFyZ2Uoc2l6ZSk7Ci0gICAgdm1BbGxvY2F0ZVBoeXNpY2FsUGFnZXNTbG9wcHkocmVz dWx0LCBzaXplKTsKKyAgICB2b2lkKiByZXN1bHQgPSB2bUFsbG9jYXRlKHNpemUsIHN1cGVyQ2h1 bmtTaXplKTsKKyAgICBtX3hMYXJnZVJhbmdlcy5wdXNoKFJhbmdlKHJlc3VsdCwgc2l6ZSkpOwog ICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK1JhbmdlIEhlYXA6OmZpbmRYTGFyZ2Uoc3RkOjpsb2Nr X2d1YXJkPFN0YXRpY011dGV4PiYsIHZvaWQqIG9iamVjdCkKK3sKKyAgICBmb3IgKGF1dG8mIHJh bmdlIDogbV94TGFyZ2VSYW5nZXMpIHsKKyAgICAgICAgaWYgKHJhbmdlLmJlZ2luKCkgIT0gb2Jq ZWN0KQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIHJldHVybiByYW5nZTsKKyAgICB9 CisKKyAgICByZXR1cm4gUmFuZ2UoKTsKK30KKwogdm9pZCBIZWFwOjpkZWFsbG9jYXRlWExhcmdl KHN0ZDo6dW5pcXVlX2xvY2s8U3RhdGljTXV0ZXg+JiBsb2NrLCB2b2lkKiBvYmplY3QpCiB7Ci0g ICAgbV92bUhlYXAuZGVhbGxvY2F0ZVhMYXJnZShsb2NrLCBvYmplY3QpOworICAgIGZvciAoYXV0 byYgcmFuZ2UgOiBtX3hMYXJnZVJhbmdlcykgeworICAgICAgICBpZiAocmFuZ2UuYmVnaW4oKSAh PSBvYmplY3QpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBSYW5nZSB0b0RlYWxs b2NhdGUgPSBtX3hMYXJnZVJhbmdlcy5wb3AoJnJhbmdlKTsKKworICAgICAgICBsb2NrLnVubG9j aygpOworICAgICAgICB2bURlYWxsb2NhdGUodG9EZWFsbG9jYXRlLmJlZ2luKCksIHRvRGVhbGxv Y2F0ZS5zaXplKCkpOworICAgICAgICBsb2NrLmxvY2soKTsKKyAgICAgICAgCisgICAgICAgIGJy ZWFrOworICAgIH0KIH0KIAogdm9pZCogSGVhcDo6YWxsb2NhdGVMYXJnZShzdGQ6OmxvY2tfZ3Vh cmQ8U3RhdGljTXV0ZXg+Jiwgc2l6ZV90IHNpemUpCkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFs bG9jL0hlYXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0hlYXAuaAko cmV2aXNpb24gMTc4Njc3KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFwLmgJKHdvcmtp bmcgY29weSkKQEAgLTEwMiw2ICsxMDIsNyBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxNZWRpdW1Q YWdlKj4gbV9tZWRpdW1QYWdlczsKIAogICAgIFNlZ3JlZ2F0ZWRGcmVlTGlzdCBtX2xhcmdlUmFu Z2VzOworICAgIFZlY3RvcjxSYW5nZT4gbV94TGFyZ2VSYW5nZXM7CiAKICAgICBib29sIG1faXNB bGxvY2F0aW5nUGFnZXM7CiAKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvVk1IZWFwLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9WTUhlYXAuaAkocmV2aXNpb24g MTc4Njc3KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9WTUhlYXAuaAkod29ya2luZyBjb3B5 KQpAQCAtNDgsMTQgKzQ4LDEwIEBAIHB1YmxpYzoKICAgICBTbWFsbFBhZ2UqIGFsbG9jYXRlU21h bGxQYWdlKCk7CiAgICAgTWVkaXVtUGFnZSogYWxsb2NhdGVNZWRpdW1QYWdlKCk7CiAgICAgUmFu Z2UgYWxsb2NhdGVMYXJnZVJhbmdlKHNpemVfdCk7Ci0gICAgdm9pZCogYWxsb2NhdGVYTGFyZ2Uo c2l6ZV90KTsKLQotICAgIFJhbmdlIGZpbmRYTGFyZ2Uodm9pZCopOwogCiAgICAgdm9pZCBkZWFs bG9jYXRlU21hbGxQYWdlKHN0ZDo6dW5pcXVlX2xvY2s8U3RhdGljTXV0ZXg+JiwgU21hbGxQYWdl Kik7CiAgICAgdm9pZCBkZWFsbG9jYXRlTWVkaXVtUGFnZShzdGQ6OnVuaXF1ZV9sb2NrPFN0YXRp Y011dGV4PiYsIE1lZGl1bVBhZ2UqKTsKICAgICB2b2lkIGRlYWxsb2NhdGVMYXJnZVJhbmdlKHN0 ZDo6dW5pcXVlX2xvY2s8U3RhdGljTXV0ZXg+JiwgUmFuZ2UpOwotICAgIHZvaWQgZGVhbGxvY2F0 ZVhMYXJnZShzdGQ6OnVuaXF1ZV9sb2NrPFN0YXRpY011dGV4PiYsIHZvaWQqKTsKIAogcHJpdmF0 ZToKICAgICB2b2lkIGFsbG9jYXRlU3VwZXJDaHVuaygpOwpAQCAtNjMsNyArNTksNiBAQCBwcml2 YXRlOgogICAgIFZlY3RvcjxTbWFsbFBhZ2UqPiBtX3NtYWxsUGFnZXM7CiAgICAgVmVjdG9yPE1l ZGl1bVBhZ2UqPiBtX21lZGl1bVBhZ2VzOwogICAgIFNlZ3JlZ2F0ZWRGcmVlTGlzdCBtX2xhcmdl UmFuZ2VzOwotICAgIFZlY3RvcjxSYW5nZT4gbV94TGFyZ2VSYW5nZXM7CiB9OwogCiBpbmxpbmUg U21hbGxQYWdlKiBWTUhlYXA6OmFsbG9jYXRlU21hbGxQYWdlKCkKQEAgLTkzLDI0ICs4OCw2IEBA IGlubGluZSBSYW5nZSBWTUhlYXA6OmFsbG9jYXRlTGFyZ2VSYW5nZSgKICAgICByZXR1cm4gcmFu Z2U7CiB9CiAKLWlubGluZSB2b2lkKiBWTUhlYXA6OmFsbG9jYXRlWExhcmdlKHNpemVfdCBzaXpl KQotewotICAgIHZvaWQqIHJlc3VsdCA9IHZtQWxsb2NhdGUoc2l6ZSwgc3VwZXJDaHVua1NpemUp OwotICAgIG1feExhcmdlUmFuZ2VzLnB1c2goUmFuZ2UocmVzdWx0LCBzaXplKSk7Ci0gICAgcmV0 dXJuIHJlc3VsdDsKLX0KLQotaW5saW5lIFJhbmdlIFZNSGVhcDo6ZmluZFhMYXJnZSh2b2lkKiBv YmplY3QpCi17Ci0gICAgZm9yIChhdXRvJiByYW5nZSA6IG1feExhcmdlUmFuZ2VzKSB7Ci0gICAg ICAgIGlmIChyYW5nZS5iZWdpbigpICE9IG9iamVjdCkKLSAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICByZXR1cm4gcmFuZ2U7Ci0gICAgfQotCi0gICAgcmV0dXJuIFJhbmdlKCk7Ci19Ci0K IGlubGluZSB2b2lkIFZNSGVhcDo6ZGVhbGxvY2F0ZVNtYWxsUGFnZShzdGQ6OnVuaXF1ZV9sb2Nr PFN0YXRpY011dGV4PiYgbG9jaywgU21hbGxQYWdlKiBwYWdlKQogewogICAgIGxvY2sudW5sb2Nr KCk7CkBAIC0xNTIsMjMgKzEyOSw2IEBAIGlubGluZSB2b2lkIFZNSGVhcDo6ZGVhbGxvY2F0ZUxh cmdlUmFuZ2UKICAgICBtX2xhcmdlUmFuZ2VzLmluc2VydChyYW5nZSk7CiB9CiAKLWlubGluZSB2 b2lkIFZNSGVhcDo6ZGVhbGxvY2F0ZVhMYXJnZShzdGQ6OnVuaXF1ZV9sb2NrPFN0YXRpY011dGV4 PiYgbG9jaywgdm9pZCogb2JqZWN0KQotewotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV94 TGFyZ2VSYW5nZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgUmFuZ2UgcmFuZ2UgPSBtX3hMYXJn ZVJhbmdlc1tpXTsKLSAgICAgICAgaWYgKHJhbmdlLmJlZ2luKCkgIT0gb2JqZWN0KQotICAgICAg ICAgICAgY29udGludWU7Ci0KLSAgICAgICAgbV94TGFyZ2VSYW5nZXMucG9wKGkpOwotCi0gICAg ICAgIGxvY2sudW5sb2NrKCk7Ci0gICAgICAgIHZtRGVhbGxvY2F0ZShyYW5nZS5iZWdpbigpLCBy YW5nZS5zaXplKCkpOwotICAgICAgICBsb2NrLmxvY2soKTsKLSAgICAgICAgCi0gICAgICAgIGJy ZWFrOwotICAgIH0KLX0KLQogfSAvLyBuYW1lc3BhY2UgYm1hbGxvYwogCiAjZW5kaWYgLy8gVk1I ZWFwX2gK