36353 2010-03-19 02:33:08 -0700 Second cut at SheriffBot 2010-03-19 02:44:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned eric oldest_to_newest 201787 0 abarth 2010-03-19 02:33:08 -0700 Second cut at SheriffBot 201788 1 51138 abarth 2010-03-19 02:35:21 -0700 Created attachment 51138 Patch 201790 2 51138 eric 2010-03-19 02:43:23 -0700 Comment on attachment 51138 Patch Looks good to me. Would be good to test the case of author lookups which fail. 201791 3 abarth 2010-03-19 02:44:35 -0700 Committed r56233: <http://trac.webkit.org/changeset/56233> 51138 2010-03-19 02:35:21 -0700 2010-03-19 02:43:23 -0700 Patch bug-36353-20100319023520.patch text/plain 11731 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhY2ExOTFiLi4xNGFiM2VkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTAtMDMt MTkgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZWNvbmQgY3V0IGF0IFNoZXJpZmZCb3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MzUzCisKKyAg ICAgICAgVGhpcyBwYXRjaCBzaG91bGQgY29udGFpbiBhIGNvbXBsZXRlIFNoZXJpZmZCb3QgdGhh dCdzIGNhcGFibGUgb2YKKyAgICAgICAgc2F5aW5nIHJlYXNvbmFibGUgdGhpbmdzIG9uIElSQy4g IEkgaGFkIHRvIHJlZmFjdG9yIHRoZSB1c2Ugb2YKKyAgICAgICAgQ29tbWl0SW5mbyB0byBtYWtl IHRoZSBTaGVyaWZmQm90IHRlc3RhYmxlLCBidXQgSSBkaWQgdGhlIG1pbmltdW0KKyAgICAgICAg bmVjZXNzYXJ5LiAgV2Ugc2hvdWxkIGdyb3cgd2Via2l0Y2hlY2tvdXQgb3ZlciB0aW1lIHRvIGNv bnRhaW4gdGhlCisgICAgICAgIGtub3dsZWRnZSBvZiBDaGFuZ2VMb2dzIGZyb20gc2NtLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9zaGVyaWZmYm90LnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvc2hlcmlmZmJvdF91bml0dGVzdC5weToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L21vY2tfYnVnemlsbGF0b29sLnB5OgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcGF0Y2gvcGF0Y2hlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3dlYmtpdGNoZWNrb3V0LnB5OiBBZGRlZC4KKworMjAxMC0wMy0xOSAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCiAgICAgICAgIFVucmV2aWV3ZWQuCiAKICAgICAgICAg Rml4IEh5YXR0J3MgSVJDIG5pY2tuYW1lLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tYW5kcy9zaGVyaWZmYm90LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tYW5kcy9zaGVyaWZmYm90LnB5CmluZGV4IDg5YTk2ZGUuLjI5MjAyYWYgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvc2hlcmlmZmJv dC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1hbmRzL3NoZXJpZmZi b3QucHkKQEAgLTI5LDcgKzI5LDYgQEAKIGltcG9ydCBvcwogCiBmcm9tIHdlYmtpdHB5LmNvbW1h bmRzLnF1ZXVlcyBpbXBvcnQgQWJzdHJhY3RRdWV1ZQotZnJvbSB3ZWJraXRweS5pcmMuaXJjcHJv eHkgaW1wb3J0IElSQ1Byb3h5CiBmcm9tIHdlYmtpdHB5LndlYmtpdF9sb2dnaW5nIGltcG9ydCBs b2cKIAogCkBAIC00MiwzMCArNDEsNDUgQEAgY2xhc3MgU2hlcmlmZkJvdChBYnN0cmFjdFF1ZXVl KToKICAgICAgICAgQWJzdHJhY3RRdWV1ZS5iZWdpbl93b3JrX3F1ZXVlKHNlbGYpCiAgICAgICAg IHNlbGYudG9vbC5lbnN1cmVfaXJjX2Nvbm5lY3RlZCgpCiAKLSAgICBkZWYgd29ya19pdGVtX2xv Z19wYXRoKHNlbGYsIHN2bl9yZXZpc2lvbik6Ci0gICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4o IiVzLWxvZ3MiICUgc2VsZi5uYW1lLCAiJXMubG9nIiAlIHN2bl9yZXZpc2lvbikKKyAgICBkZWYg d29ya19pdGVtX2xvZ19wYXRoKHNlbGYsIGZhaWx1cmVfaW5mbyk6CisgICAgICAgIHJldHVybiBv cy5wYXRoLmpvaW4oIiVzLWxvZ3MiICUgc2VsZi5uYW1lLCAiJXMubG9nIiAlIGZhaWx1cmVfaW5m b1sic3ZuX3JldmlzaW9uIl0pCiAKICAgICBkZWYgbmV4dF93b3JrX2l0ZW0oc2VsZik6Ci0gICAg ICAgICMgRklYTUU6IENhbGwgbWV0aG9kcyB0aGF0IGFuYWx5emUgdGhlIGJ1aWxkIGJvdHMuCi0g ICAgICAgIHJldHVybiBOb25lICMgRklYTUU6IFNob3VsZCBiZSBhbiBTVk4gcmV2aXNpb24gbnVt YmVyLgorICAgICAgICBmb3Igc3ZuX3JldmlzaW9uLCBidWlsZGVycyBpbiBzZWxmLnRvb2wuYnVp bGRib3QucmV2aXNpb25zX2NhdXNpbmdfZmFpbHVyZXMoKS5pdGVtcygpOgorICAgICAgICAgICAg aWYgc2VsZi50b29sLnN0YXR1c19zZXJ2ZXIuc3ZuX3JldmlzaW9uKHN2bl9yZXZpc2lvbik6Cisg ICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgIHJldHVybiB7CisgICAgICAgICAg ICAgICAgInN2bl9yZXZpc2lvbiI6IHN2bl9yZXZpc2lvbiwKKyAgICAgICAgICAgICAgICAiYnVp bGRlcnMiOiBidWlsZGVycworICAgICAgICAgICAgfQorICAgICAgICByZXR1cm4gTm9uZQogCi0g ICAgZGVmIHNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHNlbGYsIHN2bl9yZXZpc2lvbik6 CisgICAgZGVmIHNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtKHNlbGYsIGZhaWx1cmVfaW5m byk6CiAgICAgICAgICMgQ3VycmVudGx5LCB3ZSBkb24ndCBoYXZlIGFueSByZWFzb25zIG5vdCB0 byBwcm9jZWVkIHdpdGggd29yayBpdGVtcy4KICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgIGRl ZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBzdm5fcmV2aXNpb24pOgotICAgICAgICBtZXNzYWdl ID0gInIlcyBhcHBlYXJzIHRvIGhhdmUgYnJva2VuIHRoZSBidWlsZC4iICUgc3ZuX3JldmlzaW9u Ci0gICAgICAgIHNlbGYudG9vbC5pcmMoKS5wb3N0KG1lc3NhZ2UpCi0gICAgICAgICMgRklYTUU6 IFdoYXQgaWYgcnVuX3dlYmtpdF9wYXRjaCB0aHJvd3MgYW4gZXhjZXB0aW9uPwotICAgICAgICBz ZWxmLnJ1bl93ZWJraXRfcGF0Y2goWwotICAgICAgICAgICAgImNyZWF0ZS1yb2xsb3V0IiwKLSAg ICAgICAgICAgICItLWZvcmNlLWNsZWFuIiwKLSAgICAgICAgICAgICItLW5vbi1pbnRlcmFjdGl2 ZSIsCi0gICAgICAgICAgICAiLS1wYXJlbnQtY29tbWFuZD0lcyIgJSBzZWxmLm5hbWUsCi0gICAg ICAgICAgICAjIEZJWE1FOiBXZSBhbHNvIG5lZWQgdG8gQ0MgdGhlIHJldmlld2VyLCBjb21taXR0 ZXIsIGFuZCBjb250cmlidXRvci4KLSAgICAgICAgICAgICItLWNjPSVzIiAlICIsIi5qb2luKHNl bGYud2F0Y2hlcnMpLAotICAgICAgICAgICAgc3ZuX3JldmlzaW9uCi0gICAgICAgIF0pCisgICAg ZGVmIHByb2Nlc3Nfd29ya19pdGVtKHNlbGYsIGZhaWx1cmVfaW5mbyk6CisgICAgICAgIHN2bl9y ZXZpc2lvbiA9IGZhaWx1cmVfaW5mb1sic3ZuX3JldmlzaW9uIl0KKyAgICAgICAgYnVpbGRlcnMg PSBmYWlsdXJlX2luZm9bImJ1aWxkZXJzIl0KIAotICAgIGRlZiBoYW5kbGVfdW5leHBlY3RlZF9l cnJvcihzZWxmLCBzdm5fcmV2aXNpb24sIG1lc3NhZ2UpOgorICAgICAgICBjb21taXRfaW5mbyA9 IHNlbGYudG9vbC5jaGVja291dCgpLmNvbW1pdF9pbmZvX2Zvcl9yZXZpc2lvbihzdm5fcmV2aXNp b24pCisgICAgICAgIHJlc3BvbnNpYmxlX3BhcnRpZXMgPSBbCisgICAgICAgICAgICBjb21taXRf aW5mby5jb21taXR0ZXIoKSwKKyAgICAgICAgICAgIGNvbW1pdF9pbmZvLmF1dGhvcigpLAorICAg ICAgICAgICAgY29tbWl0X2luZm8ucmV2aWV3ZXIoKQorICAgICAgICBdCisgICAgICAgIGlyY19u aWNrbmFtZXMgPSBzb3J0ZWQoc2V0KFtwYXJ0eS5pcmNfbmlja25hbWUgZm9yIHBhcnR5IGluIHJl c3BvbnNpYmxlX3BhcnRpZXMgaWYgcGFydHkgYW5kIHBhcnR5LmlyY19uaWNrbmFtZV0pKQorICAg ICAgICBpcmNfcHJlZml4ID0gIjogIiBpZiBpcmNfbmlja25hbWVzIGVsc2UgIiIKKyAgICAgICAg aXJjX21lc3NhZ2UgPSAiJXMlc3IlcyBhcHBlYXJzIHRvIGhhdmUgYnJva2VuICVzIiAlICgKKyAg ICAgICAgICAgICIsICIuam9pbihpcmNfbmlja25hbWVzKSwKKyAgICAgICAgICAgIGlyY19wcmVm aXgsCisgICAgICAgICAgICBzdm5fcmV2aXNpb24sCisgICAgICAgICAgICAiLCAiLmpvaW4oW2J1 aWxkZXIubmFtZSgpIGZvciBidWlsZGVyIGluIGJ1aWxkZXJzXSkpCisKKyAgICAgICAgc2VsZi50 b29sLmlyYygpLnBvc3QoaXJjX21lc3NhZ2UpCisKKyAgICAgICAgZm9yIGJ1aWxkZXIgaW4gYnVp bGRlcnM6CisgICAgICAgICAgICBzZWxmLnRvb2wuc3RhdHVzX3NlcnZlci51cGRhdGVfc3ZuX3Jl dmlzaW9uKHN2bl9yZXZpc2lvbiwgYnVpbGRlci5uYW1lKCkpCisKKyAgICBkZWYgaGFuZGxlX3Vu ZXhwZWN0ZWRfZXJyb3Ioc2VsZiwgZmFpbHVyZV9pbmZvLCBtZXNzYWdlKToKICAgICAgICAgbG9n KG1lc3NhZ2UpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1h bmRzL3NoZXJpZmZib3RfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1hbmRzL3NoZXJpZmZib3RfdW5pdHRlc3QucHkKaW5kZXggMTNhZjM5Yi4uN2JkNGQ5ZiAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9zaGVyaWZm Ym90X3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFu ZHMvc2hlcmlmZmJvdF91bml0dGVzdC5weQpAQCAtMzAsMTQgKzMwLDE4IEBAIGltcG9ydCBvcwog CiBmcm9tIHdlYmtpdHB5LmNvbW1hbmRzLnF1ZXVlc3Rlc3QgaW1wb3J0IFF1ZXVlc1Rlc3QKIGZy b20gd2Via2l0cHkuY29tbWFuZHMuc2hlcmlmZmJvdCBpbXBvcnQgU2hlcmlmZkJvdAotZnJvbSB3 ZWJraXRweS5tb2NrX2J1Z3ppbGxhdG9vbCBpbXBvcnQgTW9ja0J1Z3ppbGxhVG9vbAorZnJvbSB3 ZWJraXRweS5tb2NrX2J1Z3ppbGxhdG9vbCBpbXBvcnQgTW9ja0J1Z3ppbGxhVG9vbCwgbW9ja19i dWlsZGVyCiAKIGNsYXNzIFNoZXJpZmZCb3RUZXN0KFF1ZXVlc1Rlc3QpOgogICAgIGRlZiB0ZXN0 X3NoZXJpZmZfYm90KHNlbGYpOgorICAgICAgICBtb2NrX3dvcmtfaXRlbSA9IHsKKyAgICAgICAg ICAgICJzdm5fcmV2aXNpb24iOiAyOTgzNywKKyAgICAgICAgICAgICJidWlsZGVycyI6IFttb2Nr X2J1aWxkZXJdCisgICAgICAgIH0KICAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gewogICAgICAg ICAgICAgImJlZ2luX3dvcmtfcXVldWUiOiAiQ0FVVElPTjogc2hlcmlmZi1ib3Qgd2lsbCBkaXNj YXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmluZyBXZWJLaXQgc2hlcmlmZi1i b3QuXG4iICUgb3MuZ2V0Y3dkKCksCiAgICAgICAgICAgICAibmV4dF93b3JrX2l0ZW0iOiAiIiwK LSAgICAgICAgICAgICJwcm9jZXNzX3dvcmtfaXRlbSI6ICJNT0NLOiBpcmMucG9zdDogcjI5ODM3 IGFwcGVhcnMgdG8gaGF2ZSBicm9rZW4gdGhlIGJ1aWxkLlxuIiwKKyAgICAgICAgICAgICJwcm9j ZXNzX3dvcmtfaXRlbSI6ICJNT0NLOiBpcmMucG9zdDogYWJhcnRoLCBkYXJpbiwgZXNlaWRlbDog cjI5ODM3IGFwcGVhcnMgdG8gaGF2ZSBicm9rZW4gTW9jayBidWlsZGVyIG5hbWUgKFRlc3RzKVxu IiwKICAgICAgICAgICAgICJoYW5kbGVfdW5leHBlY3RlZF9lcnJvciI6ICJNb2NrIGVycm9yIG1l c3NhZ2VcbiIKICAgICAgICAgfQotICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRzKFNo ZXJpZmZCb3QoKSwgd29ya19pdGVtPTI5ODM3LCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3Rk ZXJyKQorICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRzKFNoZXJpZmZCb3QoKSwgd29y a19pdGVtPW1vY2tfd29ya19pdGVtLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9tb2NrX2J1Z3ppbGxhdG9v bC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbW9ja19idWd6aWxsYXRvb2wucHkK aW5kZXggNWI2YTZjNS4uNDlhMTBjOCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9tb2NrX2J1Z3ppbGxhdG9vbC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L21vY2tfYnVnemlsbGF0b29sLnB5CkBAIC0yOSw2ICsyOSw3IEBACiBpbXBvcnQgb3MK IAogZnJvbSB3ZWJraXRweS5idWd6aWxsYSBpbXBvcnQgQnVnLCBBdHRhY2htZW50Citmcm9tIHdl YmtpdHB5LmNvbW1pdGluZm8gaW1wb3J0IENvbW1pdEluZm8KIGZyb20gd2Via2l0cHkuY29tbWl0 dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdCwgUmV2aWV3ZXIKIGZyb20gd2Via2l0cHkuc2NtIGlt cG9ydCBDb21taXRNZXNzYWdlCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkubW9jayBpbXBvcnQg TW9jawpAQCAtMTgxLDYgKzE4MiwxNSBAQCBfYnVnNCA9IHsKIH0KIAogCitjbGFzcyBNb2NrQnVp bGRlcihvYmplY3QpOgorCisgICAgZGVmIG5hbWUoc2VsZik6CisgICAgICAgIHJldHVybiAiTW9j ayBidWlsZGVyIG5hbWUgKFRlc3RzKSIKKworCittb2NrX2J1aWxkZXIgPSBNb2NrQnVpbGRlcigp CisKKwogY2xhc3MgTW9ja0J1Z3ppbGxhUXVlcmllcyhNb2NrKToKIAogICAgIGRlZiBfX2luaXRf XyhzZWxmLCBidWd6aWxsYSk6CkBAIC0yODQsNyArMjk0LDcgQEAgY2xhc3MgTW9ja0J1Z3ppbGxh KE1vY2spOgogICAgICAgICByZXR1cm4gIiVzLyVzJXMiICUgKHNlbGYuYnVnX3NlcnZlcl91cmws IGF0dGFjaG1lbnRfaWQsIGFjdGlvbl9wYXJhbSkKIAogCi1jbGFzcyBNb2NrQnVpbGRCb3QoTW9j ayk6CitjbGFzcyBNb2NrQnVpbGRCb3Qob2JqZWN0KToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxm KToKICAgICAgICAgc2VsZi5fdHJlZV9pc19vbl9maXJlID0gRmFsc2UKQEAgLTMwNiw2ICszMTYs MTAgQEAgY2xhc3MgTW9ja0J1aWxkQm90KE1vY2spOgogICAgIGRlZiBsaWdodF90cmVlX29uX2Zp cmUoc2VsZik6CiAgICAgICAgIHNlbGYuX3RyZWVfaXNfb25fZmlyZSA9IFRydWUKIAorICAgIGRl ZiByZXZpc2lvbnNfY2F1c2luZ19mYWlsdXJlcyhzZWxmKToKKyAgICAgICAgcmV0dXJuIHsKKyAg ICAgICAgICAgICIyOTgzNyI6IFttb2NrX2J1aWxkZXJdCisgICAgICAgIH0KIAogY2xhc3MgTW9j a1NDTShNb2NrKToKIApAQCAtMzUzLDYgKzM2NywxNyBAQCBjbGFzcyBNb2NrU0NNKE1vY2spOgog ICAgICAgICByZXR1cm4gW10KIAogCitjbGFzcyBNb2NrV2ViS2l0Q2hlY2tvdXQob2JqZWN0KToK KworICAgIGRlZiBjb21taXRfaW5mb19mb3JfcmV2aXNpb24oc2VsZiwgc3ZuX3JldmlzaW9uKToK KyAgICAgICAgcmV0dXJuIENvbW1pdEluZm8oc3ZuX3JldmlzaW9uLCAiZXJpY0B3ZWJraXQub3Jn IiwgeworICAgICAgICAgICAgImJ1Z19pZCI6IDQyLAorICAgICAgICAgICAgImF1dGhvcl9uYW1l IjogIkFkYW0gQmFydGgiLAorICAgICAgICAgICAgImF1dGhvcl9lbWFpbCI6ICJhYmFydGhAd2Vi a2l0Lm9yZyIsCisgICAgICAgICAgICAicmV2aWV3ZXJfdGV4dCI6ICJEYXJpbiBBZGxlciIKKyAg ICAgICAgfSkKKworCiBjbGFzcyBNb2NrVXNlcihvYmplY3QpOgogCiAgICAgQHN0YXRpY21ldGhv ZApAQCAtMzkwLDkgKzQxNSwxNSBAQCBjbGFzcyBNb2NrU3RhdHVzU2VydmVyKG9iamVjdCk6CiAg ICAgZGVmIHBhdGNoX3N0YXR1cyhzZWxmLCBxdWV1ZV9uYW1lLCBwYXRjaF9pZCk6CiAgICAgICAg IHJldHVybiBOb25lCiAKKyAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHN2bl9yZXZpc2lvbik6 CisgICAgICAgIHJldHVybiBOb25lCisKICAgICBkZWYgdXBkYXRlX3N0YXR1cyhzZWxmLCBxdWV1 ZV9uYW1lLCBzdGF0dXMsIHBhdGNoPU5vbmUsIHJlc3VsdHNfZmlsZT1Ob25lKToKICAgICAgICAg cmV0dXJuIDE4NwogCisgICAgZGVmIHVwZGF0ZV9zdm5fcmV2aXNpb24oc2VsZiwgc3ZuX3Jldmlz aW9uLCBicm9rZW5fYm90KToKKyAgICAgICAgcmV0dXJuIDE5MQorCiAKIGNsYXNzIE1vY2tCdWd6 aWxsYVRvb2woKToKIApAQCAtNDAzLDExICs0MzQsMTUgQEAgY2xhc3MgTW9ja0J1Z3ppbGxhVG9v bCgpOgogICAgICAgICBzZWxmLl9pcmMgPSBOb25lCiAgICAgICAgIHNlbGYudXNlciA9IE1vY2tV c2VyKCkKICAgICAgICAgc2VsZi5fc2NtID0gTW9ja1NDTSgpCisgICAgICAgIHNlbGYuX2NoZWNr b3V0ID0gTW9ja1dlYktpdENoZWNrb3V0KCkKICAgICAgICAgc2VsZi5zdGF0dXNfc2VydmVyID0g TW9ja1N0YXR1c1NlcnZlcigpCiAKICAgICBkZWYgc2NtKHNlbGYpOgogICAgICAgICByZXR1cm4g c2VsZi5fc2NtCiAKKyAgICBkZWYgY2hlY2tvdXQoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxm Ll9jaGVja291dAorCiAgICAgZGVmIGVuc3VyZV9pcmNfY29ubmVjdGVkKHNlbGYpOgogICAgICAg ICBpZiBub3Qgc2VsZi5faXJjOgogICAgICAgICAgICAgc2VsZi5faXJjID0gTW9ja0lSQygpCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BhdGNoL3BhdGNoZXIucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BhdGNoL3BhdGNoZXIucHkKaW5kZXggYWIz MTY4MS4uNGJmN2Y4OSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9w YXRjaC9wYXRjaGVyLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGF0Y2gv cGF0Y2hlci5weQpAQCAtNDEsNiArNDEsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1hbmRzLnF1ZXVl cyBpbXBvcnQgKgogZnJvbSB3ZWJraXRweS5jb21tYW5kcy51cGxvYWQgaW1wb3J0ICoKIGZyb20g d2Via2l0cHkuZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKIGZyb20gd2Via2l0cHkud2Via2l0 X2xvZ2dpbmcgaW1wb3J0IGxvZworZnJvbSB3ZWJraXRweS53ZWJraXRjaGVja291dCBpbXBvcnQg V2ViS2l0Q2hlY2tvdXQKIGZyb20gd2Via2l0cHkubXVsdGljb21tYW5kdG9vbCBpbXBvcnQgTXVs dGlDb21tYW5kVG9vbAogZnJvbSB3ZWJraXRweS5zY20gaW1wb3J0IGRldGVjdF9zY21fc3lzdGVt CiBmcm9tIHdlYmtpdHB5LnVzZXIgaW1wb3J0IFVzZXIKQEAgLTYzLDYgKzY0LDcgQEAgY2xhc3Mg V2ViS2l0UGF0Y2goTXVsdGlDb21tYW5kVG9vbCk6CiAgICAgICAgIHNlbGYuX2lyYyA9IE5vbmUK ICAgICAgICAgc2VsZi51c2VyID0gVXNlcigpCiAgICAgICAgIHNlbGYuX3NjbSA9IE5vbmUKKyAg ICAgICAgc2VsZi5fY2hlY2tvdXQgPSBOb25lCiAgICAgICAgIHNlbGYuc3RhdHVzX3NlcnZlciA9 IFN0YXR1c1NlcnZlcigpCiAKICAgICBkZWYgc2NtKHNlbGYpOgpAQCAtODEsNiArODMsMTEgQEAg Y2xhc3MgV2ViS2l0UGF0Y2goTXVsdGlDb21tYW5kVG9vbCk6CiAKICAgICAgICAgcmV0dXJuIHNl bGYuX3NjbQogCisgICAgZGVmIGNoZWNrb3V0KCk6CisgICAgICAgIGlmIG5vdCBzZWxmLl9jaGVj a291dDoKKyAgICAgICAgICAgIHNlbGYuX2NoZWNrb3V0ID0gV2ViS2l0Q2hlY2tvdXQoc2VsZi5z Y20oKSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX2NoZWNrb3V0CisKICAgICAjIEZJWE1FOiBBZGQg YSBwYXJhbWV0ZXIgZm9yIG5pY2tuYW1lPwogICAgIGRlZiBlbnN1cmVfaXJjX2Nvbm5lY3RlZChz ZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYuX2lyYzoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvd2Via2l0Y2hlY2tvdXQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3dlYmtpdGNoZWNrb3V0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmY0ZTcxNTQKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3dlYmtpdGNoZWNrb3V0LnB5CkBAIC0wLDAgKzEsNDAgQEAKKyMgQ29weXJpZ2h0IChj KSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIAorIyBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjIAorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAg ICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICogTmVp dGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250 cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2 ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBw ZXJtaXNzaW9uLgorIyAKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJ R0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IK KyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us CisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgorCitmcm9tIHdlYmtpdHB5LmNvbW1pdGluZm8gaW1wb3J0IENvbW1pdEluZm8KKworCisj IFRoaXMgY2xhc3MgcmVwcmVzZW50cyB0aGUgV2ViS2l0LXNwZWNpZmljIHBhcnRzIG9mIHRoZSBj aGVja291dCAobGlrZQorIyBDaGFuZ2VMb2dzKS4KKyMgRklYTUU6IE1vdmUgYSBidW5jaCBvZiBD aGFuZ2VMb2ctc3BlY2lmaWMgcHJvY2Vzc2luZyBmcm9tIFNDTSB0byB0aGlzIG9iamVjdC4KK2Ns YXNzIFdlYktpdENoZWNrb3V0KG9iamVjdCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHNjbSk6 CisgICAgICAgIHNlbGYuX3NjbSA9IHNjbQorCisgICAgZGVmIGNvbW1pdF9pbmZvX2Zvcl9yZXZp c2lvbihzZWxmLCBzdm5fcmV2aXNpb24pOgorICAgICAgICByZXR1cm4gQ29tbWl0SW5mby5jb21t aXRfaW5mb19mb3JfcmV2aXNpb24oc2VsZi5fc2NtLCBzdm5fcmV2aXNpb24pCg==