27145 2009-07-10 00:11:26 -0700 [Gtk][REGRESSION] subframe-navigate-during-main-frame-load.html fails after r45615 2009-07-18 15:55:07 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk P2 Normal --- 1 jmalonzo webkit-unassigned gustavo oldest_to_newest 130851 0 jmalonzo 2009-07-10 00:11:26 -0700 Changeset: http://trac.webkit.org/changeset/45615 Failing test: fast/loader/subframe-navigate-during-main-frame-load.html Test diff: ============== Back Forward List ============== - (file test):fast/loader/subframe-navigate-during-main-frame-load.html **nav target** -curr-> (file test):fast/loader/resources/subframe-navigate-during-main-frame-load2.html **nav target** + file:///home/jmalonzo/OpenSource/WebKit/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html **nav target** +curr-> file:///home/jmalonzo/OpenSource/WebKit/LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html **nav target** data:text/html,%3Cbody%20onload=%22layoutTestController.notifyDone();%22%3E%3C/body%3E (in frame "subframe") =============================================== Doing a similar fix as the one in r45615 in Gtk's DRT should fix this. 131267 1 32651 jmalonzo 2009-07-13 01:00:46 -0700 Created attachment 32651 patch 131681 2 32651 gustavo 2009-07-14 14:43:44 -0700 Comment on attachment 32651 patch > + const gchar* uri = webkit_web_history_item_get_uri(item); > + if (g_strcmp0(g_uri_parse_scheme(uri), "file") == 0) { You are leaking the return of g_uri_parse_scheme here. > + static gchar* layoutTestString = g_strdup("/LayoutTests/"); > + static gchar* fileTestString = g_strdup("(file test):"); These are also leaked. There should be no need to g_strdup here. Just use the static strings instead? > + result = g_string_append(result, pos + strlen(layoutTestString)); I'd suggest using sizeof("/LayoutTests/") instead of strlen. 131878 3 32782 jmalonzo 2009-07-15 07:07:16 -0700 Created attachment 32782 updated patch 131879 4 jmalonzo 2009-07-15 07:08:19 -0700 (In reply to comment #3) > Created an attachment (id=32782) [details] > updated patch I made the updates except for the strlen -> sizeof change. May I ask why? Thanks. 131886 5 32782 gustavo 2009-07-15 08:06:52 -0700 Comment on attachment 32782 updated patch > + gchar* resultStr = g_string_free(result, FALSE); > + printf("%s", resultStr); > + g_free(resultStr); I would prefer the following: printf("%s", result->str); g_string_free(result, TRUE); But I am fine either way. If you feel like changing it, please do. r=me 131887 6 gustavo 2009-07-15 08:09:37 -0700 (In reply to comment #4) > (In reply to comment #3) > > Created an attachment (id=32782) [details] [details] > > updated patch > > I made the updates except for the strlen -> sizeof change. May I ask why? > Thanks. Err... forgot to answer this one. This is more of a nit-pick. A strlen will waste runtime - we already know the size of the string in build time, since it is static and won't change. sizeof is compile-time, so no time wasted counting chars. Notice that we would have to use sizeof on the actual static string, not on the variable. But, as I said, this is a nitpick, if you feel like using strlen, there should be no problem, since this is not performance-critical code. 132386 7 32782 abarth 2009-07-16 16:11:43 -0700 Comment on attachment 32782 updated patch Please post an updated patch with the nits addressed. Removing from commit queue. 132808 8 32995 jmalonzo 2009-07-17 18:17:59 -0700 Created attachment 32995 Updated to use result->str instead of a temp var 132952 9 32995 gustavo 2009-07-18 15:40:42 -0700 Comment on attachment 32995 Updated to use result->str instead of a temp var r=me 132955 10 jmalonzo 2009-07-18 15:55:07 -0700 (In reply to comment #9) > (From update of attachment 32995 [details]) > r=me Landed as http://trac.webkit.org/changeset/46096. Thanks. 32651 2009-07-13 01:00:46 -0700 2009-07-15 07:07:10 -0700 patch bug-27145-20090713180041.patch text/plain 3138 jmalonzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjMzJlOTQ3Li5iMjczNTEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDct MTMgIEphbiBNaWNoYWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MTQ1CisgICAgICAgIFtH dGtdW1JFR1JFU1NJT05dIHN1YmZyYW1lLW5hdmlnYXRlLWR1cmluZy1tYWluLWZyYW1lLWxvYWQu aHRtbCBmYWlscyBhZnRlciByNDU2MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgorCiAyMDA5LTA3LTEyICBB ZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xp dmVyIEh1bnQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmluZGV4IDRlZmJkYmYuLjU0NjUxOTUg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC02MDA2LDggKzYwMDYsNSBAQCBodHRwL3Rl c3RzL3htbGh0dHByZXF1ZXN0L3NtYWxsLWNodW5rcy1yZXNwb25zZS10ZXh0Lmh0bWwKICMgU2Vl IEJ1ZyAjMjcxNDQgLSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjcx NDQKIHN0b3JhZ2UvZGF0YWJhc2UtbG9jay1hZnRlci1yZWxvYWQuaHRtbAogCi0jIFNlZSBCdWcg IzI3MTQ1IC0gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MTQ1Ci1m YXN0L2xvYWRlci9zdWJmcmFtZS1uYXZpZ2F0ZS1kdXJpbmctbWFpbi1mcmFtZS1sb2FkLmh0bWwK LQogIyBTZWUgQnVnICMyNzE3MSAtIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzE3MQogZmFzdC9ldmVudHMvZnJhbWUtcHJvZ3JhbW1hdGljLWZvY3VzLmh0bWwKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpp bmRleCBkZDRlMzdmLi42ZDgwNjcxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDctMTMg IEphbiBNaWNoYWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MTQ1CisgICAgICAgIFtHdGtd W1JFR1JFU1NJT05dIHN1YmZyYW1lLW5hdmlnYXRlLWR1cmluZy1tYWluLWZyYW1lLWxvYWQuaHRt bCBmYWlscyBhZnRlciByNDU2MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBOb3JtYWxpemUgZmlsZSBVUkxzLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGR1bXBIaXN0b3J5SXRlbSk6 CisKIDIwMDktMDctMTIgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAgYi9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IGFiZGVjZjYuLjgwNjJiY2Ug MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJl ZS5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVl LmNwcApAQCAtMTU3LDcgKzE1NywyNiBAQCBzdGF0aWMgdm9pZCBkdW1wSGlzdG9yeUl0ZW0oV2Vi S2l0V2ViSGlzdG9yeUl0ZW0qIGl0ZW0sIGludCBpbmRlbnQsIGJvb2wgY3VycmVudAogICAgIH0K ICAgICBmb3IgKGludCBpID0gc3RhcnQ7IGkgPCBpbmRlbnQ7IGkrKykKICAgICAgICAgcHV0Y2hh cignICcpOwotICAgIHByaW50ZigiJXMiLCB3ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9nZXRfdXJp KGl0ZW0pKTsKKworICAgIC8vIG5vcm1hbGl6ZSBmaWxlIFVSTHMuCisgICAgY29uc3QgZ2NoYXIq IHVyaSA9IHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX2dldF91cmkoaXRlbSk7CisgICAgaWYgKGdf c3RyY21wMChnX3VyaV9wYXJzZV9zY2hlbWUodXJpKSwgImZpbGUiKSA9PSAwKSB7CisgICAgICAg IHN0YXRpYyBnY2hhciogbGF5b3V0VGVzdFN0cmluZyA9IGdfc3RyZHVwKCIvTGF5b3V0VGVzdHMv Iik7CisgICAgICAgIHN0YXRpYyBnY2hhciogZmlsZVRlc3RTdHJpbmcgPSBnX3N0cmR1cCgiKGZp bGUgdGVzdCk6Iik7CisKKyAgICAgICAgZ2NoYXIqIHBvcyA9IGdfc3Ryc3RyX2xlbih1cmksIC0x LCBsYXlvdXRUZXN0U3RyaW5nKTsKKyAgICAgICAgaWYgKCFwb3MpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgR1N0cmluZyogcmVzdWx0ID0gZ19zdHJpbmdfc2l6ZWRfbmV3KHN0cmxl bih1cmkpKTsKKyAgICAgICAgcmVzdWx0ID0gZ19zdHJpbmdfYXBwZW5kKHJlc3VsdCwgZmlsZVRl c3RTdHJpbmcpOworICAgICAgICByZXN1bHQgPSBnX3N0cmluZ19hcHBlbmQocmVzdWx0LCBwb3Mg KyBzdHJsZW4obGF5b3V0VGVzdFN0cmluZykpOworICAgICAgICBnY2hhciogcmVzdWx0U3RyID0g Z19zdHJpbmdfZnJlZShyZXN1bHQsIEZBTFNFKTsKKyAgICAgICAgcHJpbnRmKCIlcyIsIHJlc3Vs dFN0cik7CisgICAgICAgIGdfZnJlZShyZXN1bHRTdHIpOworICAgIH0gZWxzZQorICAgICAgICBw cmludGYoIiVzIiwgdXJpKTsKKwogICAgIGNvbnN0IGdjaGFyKiB0YXJnZXQgPSB3ZWJraXRfd2Vi X2hpc3RvcnlfaXRlbV9nZXRfdGFyZ2V0KGl0ZW0pOwogICAgIGlmICh0YXJnZXQgJiYgc3RybGVu KHRhcmdldCkgPiAwKQogICAgICAgICBwcmludGYoIiAoaW4gZnJhbWUgXCIlc1wiKSIsIHRhcmdl dCk7 32782 2009-07-15 07:07:16 -0700 2009-07-17 18:17:53 -0700 updated patch bug-27145-20090716000714.patch text/plain 2966 jmalonzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkM2VkYjZiLi5hNjgwNjM4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDct MTUgIEphbiBNaWNoYWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MTQ1CisgICAgICAgIFtH dGtdW1JFR1JFU1NJT05dIHN1YmZyYW1lLW5hdmlnYXRlLWR1cmluZy1tYWluLWZyYW1lLWxvYWQu aHRtbCBmYWlscyBhZnRlciByNDU2MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgorCiAyMDA5LTA3LTE0ICBC cmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAgICBSdWJiZXJz dGFtcGVkIGJ5IE1hcmsgUm93ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKaW5kZXggMGUxNTEx ZC4uMGRiMDJjMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKQEAgLTU5NDAsNiArNTk0MCwz IEBAIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvc21hbGwtY2h1bmtzLXJlc3BvbnNlLXRleHQu aHRtbAogCiAjIFNlZSBCdWcgIzI3MTQ0IC0gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI3MTQ0CiBzdG9yYWdlL2RhdGFiYXNlLWxvY2stYWZ0ZXItcmVsb2FkLmh0bWwK LQotIyBTZWUgQnVnICMyNzE0NSAtIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzE0NQotZmFzdC9sb2FkZXIvc3ViZnJhbWUtbmF2aWdhdGUtZHVyaW5nLW1haW4tZnJh bWUtbG9hZC5odG1sCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKaW5kZXggMWExZjcxYi4uYzc5Mjg3YSAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDA5LTA3LTE1ICBKYW4gTWljaGFlbCBBbG9uem8gIDxqbWFsb256b0B3ZWJraXQub3Jn PgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzE0 NQorICAgICAgICBbR3RrXVtSRUdSRVNTSU9OXSBzdWJmcmFtZS1uYXZpZ2F0ZS1kdXJpbmctbWFp bi1mcmFtZS1sb2FkLmh0bWwgZmFpbHMgYWZ0ZXIgcjQ1NjE1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm9ybWFsaXplIGZpbGUgVVJMcy4KKworICAg ICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChk dW1wSGlzdG9yeUl0ZW0pOgorCiAyMDA5LTA3LTE1ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhh dXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFRyZWF0LgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNw cCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKaW5k ZXggNThiOWVjZC4uMmM5OTFmMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCkBAIC0xNjEsNyArMTYxLDI2IEBAIHN0YXRpYyB2b2lk IGR1bXBIaXN0b3J5SXRlbShXZWJLaXRXZWJIaXN0b3J5SXRlbSogaXRlbSwgaW50IGluZGVudCwg Ym9vbCBjdXJyZW50CiAgICAgfQogICAgIGZvciAoaW50IGkgPSBzdGFydDsgaSA8IGluZGVudDsg aSsrKQogICAgICAgICBwdXRjaGFyKCcgJyk7Ci0gICAgcHJpbnRmKCIlcyIsIHdlYmtpdF93ZWJf aGlzdG9yeV9pdGVtX2dldF91cmkoaXRlbSkpOworCisgICAgLy8gbm9ybWFsaXplIGZpbGUgVVJM cy4KKyAgICBjb25zdCBnY2hhciogdXJpID0gd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fZ2V0X3Vy aShpdGVtKTsKKyAgICBnY2hhciogdXJpU2NoZW1lID0gZ191cmlfcGFyc2Vfc2NoZW1lKHVyaSk7 CisgICAgaWYgKGdfc3RyY21wMCh1cmlTY2hlbWUsICJmaWxlIikgPT0gMCkgeworICAgICAgICBn Y2hhciogcG9zID0gZ19zdHJzdHJfbGVuKHVyaSwgLTEsICIvTGF5b3V0VGVzdHMvIik7CisgICAg ICAgIGlmICghcG9zKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIEdTdHJpbmcqIHJl c3VsdCA9IGdfc3RyaW5nX3NpemVkX25ldyhzdHJsZW4odXJpKSk7CisgICAgICAgIHJlc3VsdCA9 IGdfc3RyaW5nX2FwcGVuZChyZXN1bHQsICIoZmlsZSB0ZXN0KToiKTsKKyAgICAgICAgcmVzdWx0 ID0gZ19zdHJpbmdfYXBwZW5kKHJlc3VsdCwgcG9zICsgc3RybGVuKCIvTGF5b3V0VGVzdHMvIikp OworICAgICAgICBnY2hhciogcmVzdWx0U3RyID0gZ19zdHJpbmdfZnJlZShyZXN1bHQsIEZBTFNF KTsKKyAgICAgICAgcHJpbnRmKCIlcyIsIHJlc3VsdFN0cik7CisgICAgICAgIGdfZnJlZShyZXN1 bHRTdHIpOworICAgIH0gZWxzZQorICAgICAgICBwcmludGYoIiVzIiwgdXJpKTsKKworICAgIGdf ZnJlZSh1cmlTY2hlbWUpOworCiAgICAgY29uc3QgZ2NoYXIqIHRhcmdldCA9IHdlYmtpdF93ZWJf aGlzdG9yeV9pdGVtX2dldF90YXJnZXQoaXRlbSk7CiAgICAgaWYgKHRhcmdldCAmJiBzdHJsZW4o dGFyZ2V0KSA+IDApCiAgICAgICAgIHByaW50ZigiIChpbiBmcmFtZSBcIiVzXCIpIiwgdGFyZ2V0 KTs= 32995 2009-07-17 18:17:59 -0700 2009-07-18 15:40:42 -0700 Updated to use result->str instead of a temp var bug-27145-20090718111756.patch text/plain 3086 jmalonzo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ZThlODUyLi43NmRmZTVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDct MTcgIEphbiBNaWNoYWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+CisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MTQ1CisgICAgICAgIFtH dGtdW1JFR1JFU1NJT05dIHN1YmZyYW1lLW5hdmlnYXRlLWR1cmluZy1tYWluLWZyYW1lLWxvYWQu aHRtbCBmYWlscyBhZnRlciByNDU2MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgorCiAyMDA5LTA3LTE3ICBB bGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Nr aXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAppbmRleCA2OTYxMGUyLi43 ZDBkNGIwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAtNTk0Miw5ICs1OTQyLDYgQEAg aHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zbWFsbC1jaHVua3MtcmVzcG9uc2UtdGV4dC5odG1s CiAjIFNlZSBCdWcgIzI3MTQ0IC0gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI3MTQ0CiBzdG9yYWdlL2RhdGFiYXNlLWxvY2stYWZ0ZXItcmVsb2FkLmh0bWwKIAotIyBT ZWUgQnVnICMyNzE0NSAtIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NzE0NQotZmFzdC9sb2FkZXIvc3ViZnJhbWUtbmF2aWdhdGUtZHVyaW5nLW1haW4tZnJhbWUtbG9h ZC5odG1sCi0KICMgVGhpcyBwb3J0IGRvZXNuJ3Qgc3VwcG9ydCBpc29sYXRlZCB3b3JsZHMgeWV0 LgogaHR0cC90ZXN0cy9zZWN1cml0eS9pc29sYXRlZFdvcmxkL2FsbC13aW5kb3ctcHJvcGVydGll cy5odG1sCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2lzb2xhdGVkV29ybGQvYWxsLXdpbmRvdy1wcm90 b3R5cGVzLmh0bWwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRv b2xzL0NoYW5nZUxvZwppbmRleCA2MTVhMGQ0Li4wYWEyNWE0IDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMDktMDctMTcgIEphbiBNaWNoYWVsIEFsb256byAgPGptYWxvbnpvQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MTQ1 CisgICAgICAgIFtHdGtdW1JFR1JFU1NJT05dIHN1YmZyYW1lLW5hdmlnYXRlLWR1cmluZy1tYWlu LWZyYW1lLWxvYWQuaHRtbCBmYWlscyBhZnRlciByNDU2MTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3JtYWxpemUgZmlsZSBVUkxzLgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGR1 bXBIaXN0b3J5SXRlbSk6CisKIDIwMDktMDctMTcgIFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bn b29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEtpbHplci4KZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAgYi9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDU4 YjllY2QuLjljNjczZmIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0 ay9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3Rr L0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtMTYxLDcgKzE2MSwyNSBAQCBzdGF0aWMgdm9pZCBkdW1w SGlzdG9yeUl0ZW0oV2ViS2l0V2ViSGlzdG9yeUl0ZW0qIGl0ZW0sIGludCBpbmRlbnQsIGJvb2wg Y3VycmVudAogICAgIH0KICAgICBmb3IgKGludCBpID0gc3RhcnQ7IGkgPCBpbmRlbnQ7IGkrKykK ICAgICAgICAgcHV0Y2hhcignICcpOwotICAgIHByaW50ZigiJXMiLCB3ZWJraXRfd2ViX2hpc3Rv cnlfaXRlbV9nZXRfdXJpKGl0ZW0pKTsKKworICAgIC8vIG5vcm1hbGl6ZSBmaWxlIFVSTHMuCisg ICAgY29uc3QgZ2NoYXIqIHVyaSA9IHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX2dldF91cmkoaXRl bSk7CisgICAgZ2NoYXIqIHVyaVNjaGVtZSA9IGdfdXJpX3BhcnNlX3NjaGVtZSh1cmkpOworICAg IGlmIChnX3N0cmNtcDAodXJpU2NoZW1lLCAiZmlsZSIpID09IDApIHsKKyAgICAgICAgZ2NoYXIq IHBvcyA9IGdfc3Ryc3RyX2xlbih1cmksIC0xLCAiL0xheW91dFRlc3RzLyIpOworICAgICAgICBp ZiAoIXBvcykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBHU3RyaW5nKiByZXN1bHQg PSBnX3N0cmluZ19zaXplZF9uZXcoc3RybGVuKHVyaSkpOworICAgICAgICByZXN1bHQgPSBnX3N0 cmluZ19hcHBlbmQocmVzdWx0LCAiKGZpbGUgdGVzdCk6Iik7CisgICAgICAgIHJlc3VsdCA9IGdf c3RyaW5nX2FwcGVuZChyZXN1bHQsIHBvcyArIHN0cmxlbigiL0xheW91dFRlc3RzLyIpKTsKKyAg ICAgICAgcHJpbnRmKCIlcyIsIHJlc3VsdC0+c3RyKTsKKyAgICAgICAgZ19zdHJpbmdfZnJlZShy ZXN1bHQsIFRSVUUpOworICAgIH0gZWxzZQorICAgICAgICBwcmludGYoIiVzIiwgdXJpKTsKKwor ICAgIGdfZnJlZSh1cmlTY2hlbWUpOworCiAgICAgY29uc3QgZ2NoYXIqIHRhcmdldCA9IHdlYmtp dF93ZWJfaGlzdG9yeV9pdGVtX2dldF90YXJnZXQoaXRlbSk7CiAgICAgaWYgKHRhcmdldCAmJiBz dHJsZW4odGFyZ2V0KSA+IDApCiAgICAgICAgIHByaW50ZigiIChpbiBmcmFtZSBcIiVzXCIpIiwg dGFyZ2V0KTs=