26517 2009-06-18 14:35:15 -0700 webkit_web_back_forward_list_add_item() should add a ref for the history item 2009-06-20 14:58:55 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 oliver.gerlich webkit-unassigned jmalonzo oldest_to_newest 126776 0 oliver.gerlich 2009-06-18 14:35:15 -0700 When using the pywebkitgtk bindings to manually add a WebKitWebHistoryItem to a back-forward-list using WebKitWebBackForwardList.add_item(), the caller currently has to keep a reference to the item because otherwise the item is destroyed. Example: for uri in ["http://example.com/1/", "http://example.com/2/"]: item = WebHistoryItem(uri, "") bf_list.add_item(item) backList = bf_list.get_back_list_with_limit(10) This leads to a crash in the last line. Keeping the created WebHistoryItems referenced in Python (eg. by putting them into a global list) works around the problem. From what I understand, to fix this, add_item should add a reference to the item itself, so that the caller doesn't have to manually keep a reference. This happens with webkit-gtk 1.1.9 and pywebkitgtk 1.1.5 and Python 2.6.2, on Ubuntu Jaunty (9.04). 127086 1 31581 jmalonzo 2009-06-19 17:54:07 -0700 Created attachment 31581 ref the newly created items so the caller can take ownership of the item 127143 2 31596 jmalonzo 2009-06-20 07:24:58 -0700 Created attachment 31596 updated patch Add a ref when adding the item in the back forward list per kov and xan's feedback in IRC. 127146 3 31596 xan.lopez 2009-06-20 07:37:08 -0700 Comment on attachment 31596 updated patch Please update the docs also, r=me. 127163 4 jmalonzo 2009-06-20 14:58:55 -0700 (In reply to comment #3) > (From update of attachment 31596 [review]) > Please update the docs also, r=me. > Landed in r44903 31581 2009-06-19 17:54:07 -0700 2009-06-20 07:24:58 -0700 ref the newly created items so the caller can take ownership of the item backforwardlist.patch text/plain 5511 jmalonzo ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZjIxOThkOC4uMTM0MzIwMiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0wNi0xOSAg SmFuIE1pY2hhZWwgQWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXRfd2ViX2JhY2tfZm9yd2Fy ZF9saXN0X2FkZF9pdGVtKCkgc2hvdWxkIGFkZCBhIHJlZiBmb3IgdGhlIGhpc3RvcnkgaXRlbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY1MTcKKwor ICAgICAgICBBZGQgYSByZWYgdG8gbmV3bHktY3JlYXRlZCBoaXN0b3J5IGl0ZW0gb2JqZWN0cy4g VGhpcyBmdWxmaWxscyB0aGUKKyAgICAgICAgY29udHJhY3Qgb2YgV2ViS2l0V2ViSGlzdG9yeUl0 ZW0gY3JlYXRvciBmdW5jdGlvbnMgYW5kIGFsbG93cyB0aGUKKyAgICAgICAgY2FsbGVyIHRvIHRh a2Ugb3duZXJzaGlwIG9mIHRoZSBpdGVtcy4KKworICAgICAgICAqIHRlc3RzL3Rlc3R3ZWJiYWNr Zm9yd2FyZGxpc3QuYzoKKyAgICAgICAgKHRlc3Rfd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fbGlm ZXRpbWUpOgorICAgICAgICAodGVzdF93ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X29yZGVy KToKKyAgICAgICAgKHRlc3Rfd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbSk6 CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYmhpc3RvcnlpdGVtLmNwcDoKKyAgICAgICAgKHdl YmtpdF93ZWJfaGlzdG9yeV9pdGVtX25ldyk6CisgICAgICAgICh3ZWJraXRfd2ViX2hpc3Rvcnlf aXRlbV9uZXdfd2l0aF9kYXRhKToKKwogMjAwOS0wNi0xOCAgR3VzdGF2byBOb3JvbmhhIFNpbHZh ICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBi eSBYYW4gTG9wZXogYW5kIENocmlzdGlhbiBEeXdhbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsv dGVzdHMvdGVzdHdlYmJhY2tmb3J3YXJkbGlzdC5jIGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0d2Vi YmFja2ZvcndhcmRsaXN0LmMKaW5kZXggMDk1ZGFjNy4uMTE1YzA3OSAxMDA2NDQKLS0tIGEvV2Vi S2l0L2d0ay90ZXN0cy90ZXN0d2ViYmFja2ZvcndhcmRsaXN0LmMKKysrIGIvV2ViS2l0L2d0ay90 ZXN0cy90ZXN0d2ViYmFja2ZvcndhcmRsaXN0LmMKQEAgLTQ3LDE1ICs0NywxOSBAQCBzdGF0aWMg dm9pZCB0ZXN0X3dlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX2xpZmV0aW1lKHZvaWQpCiAgICAgLyog YWRkIHRlc3QgaXRlbXMgKi8KICAgICBpdGVtMSA9IHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX25l d193aXRoX2RhdGEoImh0dHA6Ly9leGFtcGxlLmNvbS8xLyIsICJTaXRlIDEiKTsKICAgICB3ZWJr aXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKGJhY2tGb3J3YXJkTGlzdCwgaXRlbTEp OworICAgIGdfb2JqZWN0X3VucmVmKGl0ZW0xKTsKIAogICAgIGl0ZW0yID0gd2Via2l0X3dlYl9o aXN0b3J5X2l0ZW1fbmV3X3dpdGhfZGF0YSgiaHR0cDovL2V4YW1wbGUuY29tLzIvIiwgIlNpdGUg MiIpOwogICAgIHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfYWRkX2l0ZW0oYmFja0Zvcndh cmRMaXN0LCBpdGVtMik7CisgICAgZ19vYmplY3RfdW5yZWYoaXRlbTIpOwogCiAgICAgaXRlbTMg PSB3ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9uZXdfd2l0aF9kYXRhKCJodHRwOi8vZXhhbXBsZS5j b20vMy8iLCAiU2l0ZSAzIik7CiAgICAgd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRf aXRlbShiYWNrRm9yd2FyZExpc3QsIGl0ZW0zKTsKKyAgICBnX29iamVjdF91bnJlZihpdGVtMyk7 CiAKICAgICBpdGVtNCA9IHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX25ld193aXRoX2RhdGEoImh0 dHA6Ly9leGFtcGxlLmNvbS80LyIsICJTaXRlIDQiKTsKICAgICB3ZWJraXRfd2ViX2JhY2tfZm9y d2FyZF9saXN0X2FkZF9pdGVtKGJhY2tGb3J3YXJkTGlzdCwgaXRlbTQpOworICAgIGdfb2JqZWN0 X3VucmVmKGl0ZW00KTsKIAogICAgIC8qIG1ha2Ugc3VyZSB0aGVzZSBmdW5jdGlvbnMgZG9uJ3Qg YWRkIHVubmVjZXNzYXJ5IHJlZiB0byB0aGUgaGlzdG9yeSBpdGVtICovCiAgICAgYmFja0l0ZW0g PSB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2dldF9iYWNrX2l0ZW0oYmFja0ZvcndhcmRM aXN0KTsKQEAgLTEzMSwxOCArMTM1LDIyIEBAIHN0YXRpYyB2b2lkIHRlc3Rfd2Via2l0X3dlYl9i YWNrX2ZvcndhcmRfbGlzdF9vcmRlcih2b2lkKQogICAgIC8vIEFkZCBhIG5ldyBpdGVtcwogICAg IGl0ZW0xID0gd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fbmV3X3dpdGhfZGF0YSgiaHR0cDovL2V4 YW1wbGUuY29tLzEvIiwgIlNpdGUgMSIpOwogICAgIHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xp c3RfYWRkX2l0ZW0od2ViQmFja0ZvcndhcmRMaXN0LCBpdGVtMSk7CisgICAgZ19vYmplY3RfdW5y ZWYoaXRlbTEpOwogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfY29u dGFpbnNfaXRlbSh3ZWJCYWNrRm9yd2FyZExpc3QsIGl0ZW0xKSk7CiAKICAgICBpdGVtMiA9IHdl YmtpdF93ZWJfaGlzdG9yeV9pdGVtX25ld193aXRoX2RhdGEoImh0dHA6Ly9leGFtcGxlLmNvbS8y LyIsICJTaXRlIDIiKTsKICAgICB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVt KHdlYkJhY2tGb3J3YXJkTGlzdCwgaXRlbTIpOworICAgIGdfb2JqZWN0X3VucmVmKGl0ZW0yKTsK ICAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2NvbnRhaW5zX2l0ZW0o d2ViQmFja0ZvcndhcmRMaXN0LCBpdGVtMikpOwogCiAgICAgaXRlbTMgPSB3ZWJraXRfd2ViX2hp c3RvcnlfaXRlbV9uZXdfd2l0aF9kYXRhKCJodHRwOi8vZXhhbXBsZS5jb20vMy8iLCAiU2l0ZSAz Iik7CiAgICAgd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbSh3ZWJCYWNrRm9y d2FyZExpc3QsIGl0ZW0zKTsKKyAgICBnX29iamVjdF91bnJlZihpdGVtMyk7CiAgICAgZ19hc3Nl cnQod2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9jb250YWluc19pdGVtKHdlYkJhY2tGb3J3 YXJkTGlzdCwgaXRlbTMpKTsKIAogICAgIGl0ZW00ID0gd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1f bmV3X3dpdGhfZGF0YSgiaHR0cDovL2V4YW1wbGUuY29tLzQvIiwgIlNpdGUgNCIpOwogICAgIHdl YmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfYWRkX2l0ZW0od2ViQmFja0ZvcndhcmRMaXN0LCBp dGVtNCk7CisgICAgZ19vYmplY3RfdW5yZWYoaXRlbTQpOwogICAgIGdfYXNzZXJ0KHdlYmtpdF93 ZWJfYmFja19mb3J3YXJkX2xpc3RfY29udGFpbnNfaXRlbSh3ZWJCYWNrRm9yd2FyZExpc3QsIGl0 ZW00KSk7CiAKICAgICAvLyBjaGVjayB0aGUgYmFjayBsaXN0IG9yZGVyCkBAIC0yMTQsNiArMjIy LDcgQEAgc3RhdGljIHZvaWQgdGVzdF93ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9p dGVtKHZvaWQpCiAgICAgLy8gQWRkIGEgbmV3IGl0ZW0KICAgICBhZGRJdGVtMSA9IHdlYmtpdF93 ZWJfaGlzdG9yeV9pdGVtX25ld193aXRoX2RhdGEoImh0dHA6Ly9leGFtcGxlLmNvbS8iLCAiQWRk ZWQgc2l0ZSIpOwogICAgIHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfYWRkX2l0ZW0od2Vi QmFja0ZvcndhcmRMaXN0LCBhZGRJdGVtMSk7CisgICAgZ19vYmplY3RfdW5yZWYoYWRkSXRlbTEp OwogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfY29udGFpbnNfaXRl bSh3ZWJCYWNrRm9yd2FyZExpc3QsIGFkZEl0ZW0xKSk7CiAKICAgICAvLyBDaGVjayB0aGF0IHRo ZSBhZGRlZCBpdGVtIGlzIHRoZSBjdXJyZW50IGl0ZW0uCkBAIC0yMjksNiArMjM4LDcgQEAgc3Rh dGljIHZvaWQgdGVzdF93ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKHZvaWQp CiAgICAgLy8gQWRkIGFub3RoZXIgaXRlbS4KICAgICBhZGRJdGVtMiA9IHdlYmtpdF93ZWJfaGlz dG9yeV9pdGVtX25ld193aXRoX2RhdGEoImh0dHA6Ly9leGFtcGxlLmNvbS8yLyIsICJBZGRlZCBz aXRlIDIiKTsKICAgICB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKHdlYkJh Y2tGb3J3YXJkTGlzdCwgYWRkSXRlbTIpOworICAgIGdfb2JqZWN0X3VucmVmKGFkZEl0ZW0yKTsK ICAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2NvbnRhaW5zX2l0ZW0o d2ViQmFja0ZvcndhcmRMaXN0LCBhZGRJdGVtMikpOwogCiAgICAgLy8gQ2hlY2sgdGhhdCB0aGUg YWRkZWQgaXRlbSBpcyBuZXcgY3VycmVudCBpdGVtLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2ViaGlzdG9yeWl0ZW0uY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2ViaGlzdG9yeWl0ZW0uY3BwCmluZGV4IGM3MGI2NGYuLjViMTA2MzQgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmhpc3RvcnlpdGVtLmNwcAorKysgYi9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJoaXN0b3J5aXRlbS5jcHAKQEAgLTI4MSw2ICsyODEsMTAgQEAgV2Vi S2l0V2ViSGlzdG9yeUl0ZW0qIHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX25ldygpCiAgICAgcHJp di0+aGlzdG9yeUl0ZW0gPSBpdGVtLnJlbGVhc2UoKS5yZWxlYXNlUmVmKCk7CiAgICAgd2Via2l0 X2hpc3RvcnlfaXRlbV9hZGQod2ViSGlzdG9yeUl0ZW0sIHByaXYtPmhpc3RvcnlJdGVtKTsKIAor ICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjUxNworICAg IC8vIEtlZXAgYSByZWZlcmVuY2UgdG8gdGhlIG5ldyBpdGVtIHNvIHRoYXQgdGhlIGNhbGxlciBj YW4gdGFrZSBvd25lcnNoaXAKKyAgICAvLyBvZiB0aGUgaXRlbS4KKyAgICBnX29iamVjdF9yZWYo d2ViSGlzdG9yeUl0ZW0pOwogICAgIHJldHVybiB3ZWJIaXN0b3J5SXRlbTsKIH0KIApAQCAtMzA1 LDYgKzMwOSwxMCBAQCBXZWJLaXRXZWJIaXN0b3J5SXRlbSogd2Via2l0X3dlYl9oaXN0b3J5X2l0 ZW1fbmV3X3dpdGhfZGF0YShjb25zdCBnY2hhciogdXJpLCBjbwogICAgIHByaXYtPmhpc3RvcnlJ dGVtID0gaXRlbS5yZWxlYXNlKCkucmVsZWFzZVJlZigpOwogICAgIHdlYmtpdF9oaXN0b3J5X2l0 ZW1fYWRkKHdlYkhpc3RvcnlJdGVtLCBwcml2LT5oaXN0b3J5SXRlbSk7CiAKKyAgICAvLyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY1MTcKKyAgICAvLyBLZWVwIGEg cmVmZXJlbmNlIHRvIHRoZSBuZXcgaXRlbSBzbyB0aGF0IHRoZSBjYWxsZXIgY2FuIHRha2Ugb3du ZXJzaGlwCisgICAgLy8gb2YgdGhlIGl0ZW0uCisgICAgZ19vYmplY3RfcmVmKHdlYkhpc3RvcnlJ dGVtKTsKICAgICByZXR1cm4gd2ViSGlzdG9yeUl0ZW07CiB9CiAK 31596 2009-06-20 07:24:58 -0700 2009-06-20 07:37:08 -0700 updated patch backforwardlist.patch text/plain 4813 jmalonzo ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggMjFjZWZmZS4uMWFiY2FjZiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOS0wNi0yMCAg SmFuIE1pY2hhZWwgQWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXRfd2ViX2JhY2tfZm9yd2Fy ZF9saXN0X2FkZF9pdGVtKCkgc2hvdWxkIGFkZCBhIHJlZiBmb3IgdGhlIGhpc3RvcnkgaXRlbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY1MTcKKwor ICAgICAgICBBZGQgYSByZWYgdG8gaXRlbXMgYWRkZWQgdG8gdGhlIGJhY2sgZm9yd2FyZCBsaXN0 LgorCisgICAgICAgICogdGVzdHMvdGVzdHdlYmJhY2tmb3J3YXJkbGlzdC5jOgorICAgICAgICAo dGVzdF93ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9saWZldGltZSk6CisgICAgICAgICh0ZXN0X3dl YmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3Rfb3JkZXIpOgorICAgICAgICAodGVzdF93ZWJraXRf d2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0 d2ViYmFja2ZvcndhcmRsaXN0LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfYmFja19mb3J3YXJk X2xpc3RfYWRkX2l0ZW0pOgorCiAyMDA5LTA2LTIwICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxn bnNAZ25vbWUub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbiBBbG9uem8uCmRpZmYgLS1n aXQgYS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3R3ZWJiYWNrZm9yd2FyZGxpc3QuYyBiL1dlYktpdC9n dGsvdGVzdHMvdGVzdHdlYmJhY2tmb3J3YXJkbGlzdC5jCmluZGV4IDA5NWRhYzcuLjExNWMwNzkg MTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvdGVzdHMvdGVzdHdlYmJhY2tmb3J3YXJkbGlzdC5jCisr KyBiL1dlYktpdC9ndGsvdGVzdHMvdGVzdHdlYmJhY2tmb3J3YXJkbGlzdC5jCkBAIC00NywxNSAr NDcsMTkgQEAgc3RhdGljIHZvaWQgdGVzdF93ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9saWZldGlt ZSh2b2lkKQogICAgIC8qIGFkZCB0ZXN0IGl0ZW1zICovCiAgICAgaXRlbTEgPSB3ZWJraXRfd2Vi X2hpc3RvcnlfaXRlbV9uZXdfd2l0aF9kYXRhKCJodHRwOi8vZXhhbXBsZS5jb20vMS8iLCAiU2l0 ZSAxIik7CiAgICAgd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbShiYWNrRm9y d2FyZExpc3QsIGl0ZW0xKTsKKyAgICBnX29iamVjdF91bnJlZihpdGVtMSk7CiAKICAgICBpdGVt MiA9IHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX25ld193aXRoX2RhdGEoImh0dHA6Ly9leGFtcGxl LmNvbS8yLyIsICJTaXRlIDIiKTsKICAgICB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2Fk ZF9pdGVtKGJhY2tGb3J3YXJkTGlzdCwgaXRlbTIpOworICAgIGdfb2JqZWN0X3VucmVmKGl0ZW0y KTsKIAogICAgIGl0ZW0zID0gd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fbmV3X3dpdGhfZGF0YSgi aHR0cDovL2V4YW1wbGUuY29tLzMvIiwgIlNpdGUgMyIpOwogICAgIHdlYmtpdF93ZWJfYmFja19m b3J3YXJkX2xpc3RfYWRkX2l0ZW0oYmFja0ZvcndhcmRMaXN0LCBpdGVtMyk7CisgICAgZ19vYmpl Y3RfdW5yZWYoaXRlbTMpOwogCiAgICAgaXRlbTQgPSB3ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9u ZXdfd2l0aF9kYXRhKCJodHRwOi8vZXhhbXBsZS5jb20vNC8iLCAiU2l0ZSA0Iik7CiAgICAgd2Vi a2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbShiYWNrRm9yd2FyZExpc3QsIGl0ZW00 KTsKKyAgICBnX29iamVjdF91bnJlZihpdGVtNCk7CiAKICAgICAvKiBtYWtlIHN1cmUgdGhlc2Ug ZnVuY3Rpb25zIGRvbid0IGFkZCB1bm5lY2Vzc2FyeSByZWYgdG8gdGhlIGhpc3RvcnkgaXRlbSAq LwogICAgIGJhY2tJdGVtID0gd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9nZXRfYmFja19p dGVtKGJhY2tGb3J3YXJkTGlzdCk7CkBAIC0xMzEsMTggKzEzNSwyMiBAQCBzdGF0aWMgdm9pZCB0 ZXN0X3dlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3Rfb3JkZXIodm9pZCkKICAgICAvLyBBZGQg YSBuZXcgaXRlbXMKICAgICBpdGVtMSA9IHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX25ld193aXRo X2RhdGEoImh0dHA6Ly9leGFtcGxlLmNvbS8xLyIsICJTaXRlIDEiKTsKICAgICB3ZWJraXRfd2Vi X2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKHdlYkJhY2tGb3J3YXJkTGlzdCwgaXRlbTEpOwor ICAgIGdfb2JqZWN0X3VucmVmKGl0ZW0xKTsKICAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX2JhY2tf Zm9yd2FyZF9saXN0X2NvbnRhaW5zX2l0ZW0od2ViQmFja0ZvcndhcmRMaXN0LCBpdGVtMSkpOwog CiAgICAgaXRlbTIgPSB3ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9uZXdfd2l0aF9kYXRhKCJodHRw Oi8vZXhhbXBsZS5jb20vMi8iLCAiU2l0ZSAyIik7CiAgICAgd2Via2l0X3dlYl9iYWNrX2Zvcndh cmRfbGlzdF9hZGRfaXRlbSh3ZWJCYWNrRm9yd2FyZExpc3QsIGl0ZW0yKTsKKyAgICBnX29iamVj dF91bnJlZihpdGVtMik7CiAgICAgZ19hc3NlcnQod2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlz dF9jb250YWluc19pdGVtKHdlYkJhY2tGb3J3YXJkTGlzdCwgaXRlbTIpKTsKIAogICAgIGl0ZW0z ID0gd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fbmV3X3dpdGhfZGF0YSgiaHR0cDovL2V4YW1wbGUu Y29tLzMvIiwgIlNpdGUgMyIpOwogICAgIHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfYWRk X2l0ZW0od2ViQmFja0ZvcndhcmRMaXN0LCBpdGVtMyk7CisgICAgZ19vYmplY3RfdW5yZWYoaXRl bTMpOwogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfY29udGFpbnNf aXRlbSh3ZWJCYWNrRm9yd2FyZExpc3QsIGl0ZW0zKSk7CiAKICAgICBpdGVtNCA9IHdlYmtpdF93 ZWJfaGlzdG9yeV9pdGVtX25ld193aXRoX2RhdGEoImh0dHA6Ly9leGFtcGxlLmNvbS80LyIsICJT aXRlIDQiKTsKICAgICB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKHdlYkJh Y2tGb3J3YXJkTGlzdCwgaXRlbTQpOworICAgIGdfb2JqZWN0X3VucmVmKGl0ZW00KTsKICAgICBn X2Fzc2VydCh3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2NvbnRhaW5zX2l0ZW0od2ViQmFj a0ZvcndhcmRMaXN0LCBpdGVtNCkpOwogCiAgICAgLy8gY2hlY2sgdGhlIGJhY2sgbGlzdCBvcmRl cgpAQCAtMjE0LDYgKzIyMiw3IEBAIHN0YXRpYyB2b2lkIHRlc3Rfd2Via2l0X3dlYl9iYWNrX2Zv cndhcmRfbGlzdF9hZGRfaXRlbSh2b2lkKQogICAgIC8vIEFkZCBhIG5ldyBpdGVtCiAgICAgYWRk SXRlbTEgPSB3ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9uZXdfd2l0aF9kYXRhKCJodHRwOi8vZXhh bXBsZS5jb20vIiwgIkFkZGVkIHNpdGUiKTsKICAgICB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9s aXN0X2FkZF9pdGVtKHdlYkJhY2tGb3J3YXJkTGlzdCwgYWRkSXRlbTEpOworICAgIGdfb2JqZWN0 X3VucmVmKGFkZEl0ZW0xKTsKICAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9s aXN0X2NvbnRhaW5zX2l0ZW0od2ViQmFja0ZvcndhcmRMaXN0LCBhZGRJdGVtMSkpOwogCiAgICAg Ly8gQ2hlY2sgdGhhdCB0aGUgYWRkZWQgaXRlbSBpcyB0aGUgY3VycmVudCBpdGVtLgpAQCAtMjI5 LDYgKzIzOCw3IEBAIHN0YXRpYyB2b2lkIHRlc3Rfd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlz dF9hZGRfaXRlbSh2b2lkKQogICAgIC8vIEFkZCBhbm90aGVyIGl0ZW0uCiAgICAgYWRkSXRlbTIg PSB3ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9uZXdfd2l0aF9kYXRhKCJodHRwOi8vZXhhbXBsZS5j b20vMi8iLCAiQWRkZWQgc2l0ZSAyIik7CiAgICAgd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlz dF9hZGRfaXRlbSh3ZWJCYWNrRm9yd2FyZExpc3QsIGFkZEl0ZW0yKTsKKyAgICBnX29iamVjdF91 bnJlZihhZGRJdGVtMik7CiAgICAgZ19hc3NlcnQod2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlz dF9jb250YWluc19pdGVtKHdlYkJhY2tGb3J3YXJkTGlzdCwgYWRkSXRlbTIpKTsKIAogICAgIC8v IENoZWNrIHRoYXQgdGhlIGFkZGVkIGl0ZW0gaXMgbmV3IGN1cnJlbnQgaXRlbS4KZGlmZiAtLWdp dCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmJhY2tmb3J3YXJkbGlzdC5jcHAgYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJiYWNrZm9yd2FyZGxpc3QuY3BwCmluZGV4IDZkMzgxMzAu LjY1ZGRiN2UgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmJhY2tmb3J3 YXJkbGlzdC5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRs aXN0LmNwcApAQCAtNDI5LDYgKzQyOSw4IEBAIHZvaWQgd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRf bGlzdF9hZGRfaXRlbShXZWJLaXRXZWJCYWNrRm9yd2FyZExpc3QgKndlYkJhY2tGb3J3CiB7CiAg ICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX0JBQ0tfRk9SV0FSRF9MSVNUKHdlYkJh Y2tGb3J3YXJkTGlzdCkpOwogCisgICAgZ19vYmplY3RfcmVmKHdlYkhpc3RvcnlJdGVtKTsKKwog ICAgIFdlYkNvcmU6OkJhY2tGb3J3YXJkTGlzdCogYmFja0ZvcndhcmRMaXN0ID0gY29yZSh3ZWJC YWNrRm9yd2FyZExpc3QpOwogICAgIFdlYkNvcmU6Okhpc3RvcnlJdGVtKiBoaXN0b3J5SXRlbSA9 IGNvcmUod2ViSGlzdG9yeUl0ZW0pOwogCg==