39576 2010-05-23 17:55:40 -0700 Split PatchReader out into its own file 2010-05-23 18:06:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth cjerdonek oldest_to_newest 229541 0 eric 2010-05-23 17:55:40 -0700 Split PatchReader out into its own file 229542 1 56840 eric 2010-05-23 17:58:16 -0700 Created attachment 56840 Patch 229543 2 56840 dbates 2010-05-23 18:02:46 -0700 Comment on attachment 56840 Patch Looks good to me. 229545 3 eric 2010-05-23 18:06:55 -0700 Committed r60053: <http://trac.webkit.org/changeset/60053> 56840 2010-05-23 17:58:16 -0700 2010-05-23 18:02:45 -0700 Patch bug-39576-20100523175815.patch text/plain 14783 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1N2YyZDg1NGU2YTY3ZjVkODdkMzAyMDg2M2MzYWRiN2U4ZjM0Yjc3Li5jZWEzZjcw OWU4MmEwMTE4Njc5YzdkMDU0ZGUyZTI5NGYyNjA1Y2Q2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTAtMDUtMjMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwbGl0IFBhdGNoUmVhZGVyIG91 dCBpbnRvIGl0cyBvd24gZmlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mzk1NzYKKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBt YWtpbmcgY2hlY2std2Via2l0LXN0eWxlCisgICAgICAgIHN1cHBvcnQgYmVpbmcgcGFzc2VkIHBh dGhzIHRvIHBhdGNoIGZpbGVzIG9uIHRoZSBjb21tYW5kIGxpbmUuCisKKyAgICAgICAgKiBTY3Jp cHRzL2NoZWNrLXdlYmtpdC1zdHlsZToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3Vu aXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvcGF0Y2hyZWFkZXIu cHk6IEFkZGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvcGF0Y2hyZWFkZXJf dW5pdHRlc3QucHk6IEFkZGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGVfcmVm ZXJlbmNlcy5weToKKwogMjAxMC0wNS0yMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRlcy4KZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvY2hlY2std2Via2l0LXN0eWxlIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9j aGVjay13ZWJraXQtc3R5bGUKaW5kZXggZjc0YzNiZDEzYjIzODkyZjJiMzFkNjNlMmM2NGFhMTdh Y2FlNDg3My4uMTlkMzc2Mjc1NTkyN2RiZTUyOTJiZjU5MTU5NzA4ZDkyMWFiNmQyNyAxMDA3NTUK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUKQEAgLTUwLDcgKzUwLDcgQEAgaW1wb3J0 IHN5cwogCiBmcm9tIHdlYmtpdHB5LnN0eWxlX3JlZmVyZW5jZXMgaW1wb3J0IGRldGVjdF9jaGVj a291dAogaW1wb3J0IHdlYmtpdHB5LnN0eWxlLmNoZWNrZXIgYXMgY2hlY2tlcgotZnJvbSB3ZWJr aXRweS5zdHlsZS5jaGVja2VyIGltcG9ydCBQYXRjaFJlYWRlcgorZnJvbSB3ZWJraXRweS5zdHls ZS5wYXRjaHJlYWRlciBpbXBvcnQgUGF0Y2hSZWFkZXIKIGZyb20gd2Via2l0cHkuc3R5bGUuY2hl Y2tlciBpbXBvcnQgU3R5bGVQcm9jZXNzb3IKIGZyb20gd2Via2l0cHkuc3R5bGUuZmlsZXJlYWRl ciBpbXBvcnQgVGV4dEZpbGVSZWFkZXIKIGZyb20gd2Via2l0cHkuc3R5bGUubWFpbiBpbXBvcnQg Y2hhbmdlX2RpcmVjdG9yeQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2VyLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2VyLnB5CmluZGV4IDU5YTNkMzlmNGMzMzdiM2Q3NzJjODFlYTYyOWVkNjMwYWFkOGFmOTIu LjhmYzg2YzNiYTJiZWI0YTNkOTZmYTJiZGQ1MzM0NTNhNDFhOTRiYzEgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKQEAgLTQzLDcgKzQzLDYgQEAg ZnJvbSBlcnJvcl9oYW5kbGVycyBpbXBvcnQgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyCiBmcm9t IGZpbHRlciBpbXBvcnQgRmlsdGVyQ29uZmlndXJhdGlvbgogZnJvbSBvcHRwYXJzZXIgaW1wb3J0 IEFyZ3VtZW50UGFyc2VyCiBmcm9tIG9wdHBhcnNlciBpbXBvcnQgRGVmYXVsdENvbW1hbmRPcHRp b25WYWx1ZXMKLWZyb20gd2Via2l0cHkuc3R5bGVfcmVmZXJlbmNlcyBpbXBvcnQgcGFyc2VfcGF0 Y2gKIGZyb20gd2Via2l0cHkuc3R5bGVfcmVmZXJlbmNlcyBpbXBvcnQgY29uZmlndXJlX2xvZ2dp bmcgYXMgX2NvbmZpZ3VyZV9sb2dnaW5nCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcigid2Vi a2l0cHkuc3R5bGUuY2hlY2tlciIpCkBAIC02OTcsNDIgKzY5NiwzIEBAIGNsYXNzIFN0eWxlUHJv Y2Vzc29yKFByb2Nlc3NvckJhc2UpOgogICAgICAgICBfbG9nLmRlYnVnKCJVc2luZyBjbGFzczog IiArIGNoZWNrZXIuX19jbGFzc19fLl9fbmFtZV9fKQogCiAgICAgICAgIGNoZWNrZXIuY2hlY2so bGluZXMpCi0KLQotY2xhc3MgUGF0Y2hSZWFkZXIob2JqZWN0KToKLQotICAgICIiIlN1cHBvcnRz IGNoZWNraW5nIHN0eWxlIGluIHBhdGNoZXMuIiIiCi0KLSAgICBkZWYgX19pbml0X18oc2VsZiwg dGV4dF9maWxlX3JlYWRlcik6Ci0gICAgICAgICIiIkNyZWF0ZSBhIFBhdGNoUmVhZGVyIGluc3Rh bmNlLgotCi0gICAgICAgIEFyZ3M6Ci0gICAgICAgICAgdGV4dF9maWxlX3JlYWRlcjogQSBUZXh0 RmlsZVJlYWRlciBpbnN0YW5jZS4KLQotICAgICAgICAiIiIKLSAgICAgICAgc2VsZi5fdGV4dF9m aWxlX3JlYWRlciA9IHRleHRfZmlsZV9yZWFkZXIKLQotICAgIGRlZiBjaGVjayhzZWxmLCBwYXRj aF9zdHJpbmcpOgotICAgICAgICAiIiJDaGVjayBzdHlsZSBpbiB0aGUgZ2l2ZW4gcGF0Y2guIiIi Ci0gICAgICAgIHBhdGNoX2ZpbGVzID0gcGFyc2VfcGF0Y2gocGF0Y2hfc3RyaW5nKQotCi0gICAg ICAgICMgVGhlIGRpZmYgdmFyaWFibGUgaXMgYSBEaWZmRmlsZSBpbnN0YW5jZS4KLSAgICAgICAg Zm9yIHBhdGgsIGRpZmYgaW4gcGF0Y2hfZmlsZXMuaXRlcml0ZW1zKCk6Ci0gICAgICAgICAgICBs aW5lX251bWJlcnMgPSBzZXQoKQotICAgICAgICAgICAgZm9yIGxpbmUgaW4gZGlmZi5saW5lczoK LSAgICAgICAgICAgICAgICAjIFdoZW4gZGVsZXRlZCBsaW5lIGlzIG5vdCBzZXQsIGl0IG1lYW5z IHRoYXQKLSAgICAgICAgICAgICAgICAjIHRoZSBsaW5lIGlzIG5ld2x5IGFkZGVkIChvciBtb2Rp ZmllZCkuCi0gICAgICAgICAgICAgICAgaWYgbm90IGxpbmVbMF06Ci0gICAgICAgICAgICAgICAg ICAgIGxpbmVfbnVtYmVycy5hZGQobGluZVsxXSkKLQotICAgICAgICAgICAgX2xvZy5kZWJ1Zygn Rm91bmQgJXMgbmV3IG9yIG1vZGlmaWVkIGxpbmVzIGluOiAlcycKLSAgICAgICAgICAgICAgICAg ICAgICAgJSAobGVuKGxpbmVfbnVtYmVycyksIHBhdGgpKQotCi0gICAgICAgICAgICAjIElmIGxp bmVfbnVtYmVycyBpcyBlbXB0eSwgdGhlIGZpbGUgaGFzIG5vIG5ldyBvcgotICAgICAgICAgICAg IyBtb2RpZmllZCBsaW5lcy4gIEluIHRoaXMgY2FzZSwgd2UgZG9uJ3QgY2hlY2sgdGhlIGZpbGUK LSAgICAgICAgICAgICMgYmVjYXVzZSB3ZSdsbCBuZXZlciBvdXRwdXQgZXJyb3JzIGZvciB0aGUg ZmlsZS4KLSAgICAgICAgICAgICMgVGhpcyBvcHRpbWl6YXRpb24gYWxzbyBwcmV2ZW50cyB0aGUg cHJvZ3JhbSBmcm9tIGV4aXRpbmcKLSAgICAgICAgICAgICMgZHVlIHRvIGEgZGVsZXRlZCBmaWxl LgotICAgICAgICAgICAgaWYgbGluZV9udW1iZXJzOgotICAgICAgICAgICAgICAgIHNlbGYuX3Rl eHRfZmlsZV9yZWFkZXIucHJvY2Vzc19maWxlKGZpbGVfcGF0aD1wYXRoLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpbmVfbnVtYmVycz1saW5l X251bWJlcnMpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJfdW5pdHRlc3QucHkKaW5kZXggNmUxZWFhMjI4MWRkYzZiN2RiOTBjZTY5MDc2NjVk YjI5MGM2ZTQ4ZC4uZTk5YWM2ODU0ZGYzODk1ZTZhODIzOTFlZjY2OWJmZDE5OTliMjc5NSAxMDA3 NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0 ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91 bml0dGVzdC5weQpAQCAtMzksNyArMzksNiBAQCBpbXBvcnQgb3MKIGltcG9ydCB1bml0dGVzdAog CiBpbXBvcnQgY2hlY2tlciBhcyBzdHlsZQotZnJvbSB3ZWJraXRweS5zdHlsZV9yZWZlcmVuY2Vz IGltcG9ydCBwYXJzZV9wYXRjaAogZnJvbSB3ZWJraXRweS5zdHlsZV9yZWZlcmVuY2VzIGltcG9y dCBMb2dUZXN0aW5nCiBmcm9tIHdlYmtpdHB5LnN0eWxlX3JlZmVyZW5jZXMgaW1wb3J0IFRlc3RM b2dTdHJlYW0KIGZyb20gY2hlY2tlciBpbXBvcnQgX0JBU0VfRklMVEVSX1JVTEVTCkBAIC01MCw3 ICs0OSw2IEBAIGZyb20gY2hlY2tlciBpbXBvcnQgY2hlY2tfd2Via2l0X3N0eWxlX2NvbmZpZ3Vy YXRpb24KIGZyb20gY2hlY2tlciBpbXBvcnQgY2hlY2tfd2Via2l0X3N0eWxlX3BhcnNlcgogZnJv bSBjaGVja2VyIGltcG9ydCBjb25maWd1cmVfbG9nZ2luZwogZnJvbSBjaGVja2VyIGltcG9ydCBD aGVja2VyRGlzcGF0Y2hlcgotZnJvbSBjaGVja2VyIGltcG9ydCBQYXRjaFJlYWRlcgogZnJvbSBj aGVja2VyIGltcG9ydCBQcm9jZXNzb3JCYXNlCiBmcm9tIGNoZWNrZXIgaW1wb3J0IFN0eWxlUHJv Y2Vzc29yCiBmcm9tIGNoZWNrZXIgaW1wb3J0IFN0eWxlUHJvY2Vzc29yQ29uZmlndXJhdGlvbgpA QCAtNzY5LDUyICs3NjcsMyBAQCBjbGFzcyBTdHlsZVByb2Nlc3Nvcl9Db2RlQ292ZXJhZ2VUZXN0 KExvZ2dpbmdUZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVy cm9yLCBzZWxmLl9wcm9jZXNzb3IucHJvY2VzcywKICAgICAgICAgICAgICAgICAgICAgICAgICAg bGluZXM9WydsaW5lMScsICdsaW5lMiddLCBmaWxlX3BhdGg9cGF0aCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgbGluZV9udW1iZXJzPVsxMDBdKQotCi0KLWNsYXNzIFBhdGNoUmVhZGVyVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0KLSAgICAiIiJUZXN0IHRoZSBQYXRjaFJlYWRlciBjbGFz cy4iIiIKLQotICAgIGNsYXNzIE1vY2tUZXh0RmlsZVJlYWRlcihvYmplY3QpOgotCi0gICAgICAg IGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgICAgIHNlbGYucGFzc2VkX3RvX3Byb2Nlc3Nf ZmlsZSA9IFtdCi0gICAgICAgICAgICAiIiJBIGxpc3Qgb2YgKGZpbGVfcGF0aCwgbGluZV9udW1i ZXJzKSBwYWlycy4iIiIKLQotICAgICAgICBkZWYgcHJvY2Vzc19maWxlKHNlbGYsIGZpbGVfcGF0 aCwgbGluZV9udW1iZXJzKToKLSAgICAgICAgICAgIHNlbGYucGFzc2VkX3RvX3Byb2Nlc3NfZmls ZS5hcHBlbmQoKGZpbGVfcGF0aCwgbGluZV9udW1iZXJzKSkKLQotICAgIGRlZiBzZXRVcChzZWxm KToKLSAgICAgICAgZmlsZV9yZWFkZXIgPSBzZWxmLk1vY2tUZXh0RmlsZVJlYWRlcigpCi0gICAg ICAgIHNlbGYuX2ZpbGVfcmVhZGVyID0gZmlsZV9yZWFkZXIKLSAgICAgICAgc2VsZi5fcGF0Y2hf Y2hlY2tlciA9IFBhdGNoUmVhZGVyKGZpbGVfcmVhZGVyKQotCi0gICAgZGVmIF9jYWxsX2NoZWNr X3BhdGNoKHNlbGYsIHBhdGNoX3N0cmluZyk6Ci0gICAgICAgIHNlbGYuX3BhdGNoX2NoZWNrZXIu Y2hlY2socGF0Y2hfc3RyaW5nKQotCi0gICAgZGVmIF9hc3NlcnRfY2hlY2tlZChzZWxmLCBwYXNz ZWRfdG9fcHJvY2Vzc19maWxlKToKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5fZmls ZV9yZWFkZXIucGFzc2VkX3RvX3Byb2Nlc3NfZmlsZSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgcGFzc2VkX3RvX3Byb2Nlc3NfZmlsZSkKLQotICAgIGRlZiB0ZXN0X2NoZWNrX3BhdGNoKHNl bGYpOgotICAgICAgICAjIFRoZSBtb2RpZmllZCBsaW5lX251bWJlcnMgYXJyYXkgZm9yIHRoaXMg cGF0Y2ggaXM6IFsyXS4KLSAgICAgICAgc2VsZi5fY2FsbF9jaGVja19wYXRjaCgiIiJkaWZmIC0t Z2l0IGEvX19pbml0X18ucHkgYi9fX2luaXRfXy5weQotaW5kZXggZWY2NWJlZS4uZTNkYjcwZSAx MDA2NDQKLS0tLSBhL19faW5pdF9fLnB5Ci0rKysgYi9fX2luaXRfXy5weQotQEAgLTEsMSArMSwy IEBACi0gIyBSZXF1aXJlZCBmb3IgUHl0aG9uIHRvIHNlYXJjaCB0aGlzIGRpcmVjdG9yeSBmb3Ig bW9kdWxlIGZpbGVzCi0rIyBOZXcgbGluZQotIiIiKQotICAgICAgICBzZWxmLl9hc3NlcnRfY2hl Y2tlZChbKCJfX2luaXRfXy5weSIsIHNldChbMl0pKV0pCi0KLSAgICBkZWYgdGVzdF9jaGVja19w YXRjaF93aXRoX2RlbGV0aW9uKHNlbGYpOgotICAgICAgICBzZWxmLl9jYWxsX2NoZWNrX3BhdGNo KCIiIkluZGV4OiBfX2luaXRfXy5weQotPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0tIF9faW5pdF9fLnB5ICAocmV2 aXNpb24gMzU5MykKLSsrKyBfX2luaXRfXy5weSAgKHdvcmtpbmcgY29weSkKLUBAIC0xICswLDAg QEAKLS1mb29iYXIKLSIiIikKLSAgICAgICAgIyBfbW9ja19jaGVja19maWxlIHNob3VsZCBub3Qg YmUgY2FsbGVkIGZvciB0aGUgZGVsZXRpb24gcGF0Y2guCi0gICAgICAgIHNlbGYuX2Fzc2VydF9j aGVja2VkKFtdKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9wYXRjaHJlYWRlci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvcGF0 Y2hyZWFkZXIucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2JhMmI2NjUxYjk4NjUyODZlNTJjZmZhYmE5NWQ1YzM4 N2YyNjc3YQotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvcGF0Y2hyZWFkZXIucHkKQEAgLTAsMCArMSw3NSBAQAorIyBDb3B5cmlnaHQgKEMpIDIw MTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDEw IENocmlzIEplcmRvbmVrIChjaHJpcy5qZXJkb25la0BnbWFpbC5jb20pCisjIENvcHlyaWdodCAo QykgMjAxMCBQcm9GVVNJT04gZW1iZWRkZWQgc3lzdGVtcworIworIyBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAgICogUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorIyBj b3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAgKiBOZWl0aGVyIHRo ZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisjIGNvbnRyaWJ1dG9y cyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9t CisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Np b24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xE RVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElF RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgVEhFIElNUExJ RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisjIEEgUEFS VElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09Q WVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFBST0NVUkVN RU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorIyBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO RCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKwor aW1wb3J0IGxvZ2dpbmcKKworZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuZGlmZl9wYXJz ZXIgaW1wb3J0IERpZmZQYXJzZXIKKworCitfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoIndlYmtp dHB5LnN0eWxlLnBhdGNocmVhZGVyIikKKworCitjbGFzcyBQYXRjaFJlYWRlcihvYmplY3QpOgor CisgICAgIiIiU3VwcG9ydHMgY2hlY2tpbmcgc3R5bGUgaW4gcGF0Y2hlcy4iIiIKKworICAgIGRl ZiBfX2luaXRfXyhzZWxmLCB0ZXh0X2ZpbGVfcmVhZGVyKToKKyAgICAgICAgIiIiQ3JlYXRlIGEg UGF0Y2hSZWFkZXIgaW5zdGFuY2UuCisKKyAgICAgICAgQXJnczoKKyAgICAgICAgICB0ZXh0X2Zp bGVfcmVhZGVyOiBBIFRleHRGaWxlUmVhZGVyIGluc3RhbmNlLgorCisgICAgICAgICIiIgorICAg ICAgICBzZWxmLl90ZXh0X2ZpbGVfcmVhZGVyID0gdGV4dF9maWxlX3JlYWRlcgorCisgICAgZGVm IGNoZWNrKHNlbGYsIHBhdGNoX3N0cmluZyk6CisgICAgICAgICIiIkNoZWNrIHN0eWxlIGluIHRo ZSBnaXZlbiBwYXRjaC4iIiIKKyAgICAgICAgcGF0Y2hfZmlsZXMgPSBEaWZmUGFyc2VyKHBhdGNo X3N0cmluZy5zcGxpdGxpbmVzKCkpLmZpbGVzCisKKyAgICAgICAgIyBUaGUgZGlmZiB2YXJpYWJs ZSBpcyBhIERpZmZGaWxlIGluc3RhbmNlLgorICAgICAgICBmb3IgcGF0aCwgZGlmZiBpbiBwYXRj aF9maWxlcy5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgIGxpbmVfbnVtYmVycyA9IHNldCgpCisg ICAgICAgICAgICBmb3IgbGluZSBpbiBkaWZmLmxpbmVzOgorICAgICAgICAgICAgICAgICMgV2hl biBkZWxldGVkIGxpbmUgaXMgbm90IHNldCwgaXQgbWVhbnMgdGhhdAorICAgICAgICAgICAgICAg ICMgdGhlIGxpbmUgaXMgbmV3bHkgYWRkZWQgKG9yIG1vZGlmaWVkKS4KKyAgICAgICAgICAgICAg ICBpZiBub3QgbGluZVswXToKKyAgICAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJzLmFkZChs aW5lWzFdKQorCisgICAgICAgICAgICBfbG9nLmRlYnVnKCdGb3VuZCAlcyBuZXcgb3IgbW9kaWZp ZWQgbGluZXMgaW46ICVzJworICAgICAgICAgICAgICAgICAgICAgICAlIChsZW4obGluZV9udW1i ZXJzKSwgcGF0aCkpCisKKyAgICAgICAgICAgICMgSWYgbGluZV9udW1iZXJzIGlzIGVtcHR5LCB0 aGUgZmlsZSBoYXMgbm8gbmV3IG9yCisgICAgICAgICAgICAjIG1vZGlmaWVkIGxpbmVzLiAgSW4g dGhpcyBjYXNlLCB3ZSBkb24ndCBjaGVjayB0aGUgZmlsZQorICAgICAgICAgICAgIyBiZWNhdXNl IHdlJ2xsIG5ldmVyIG91dHB1dCBlcnJvcnMgZm9yIHRoZSBmaWxlLgorICAgICAgICAgICAgIyBU aGlzIG9wdGltaXphdGlvbiBhbHNvIHByZXZlbnRzIHRoZSBwcm9ncmFtIGZyb20gZXhpdGluZwor ICAgICAgICAgICAgIyBkdWUgdG8gYSBkZWxldGVkIGZpbGUuCisgICAgICAgICAgICBpZiBsaW5l X251bWJlcnM6CisgICAgICAgICAgICAgICAgc2VsZi5fdGV4dF9maWxlX3JlYWRlci5wcm9jZXNz X2ZpbGUoZmlsZV9wYXRoPXBhdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJzPWxpbmVfbnVtYmVycykKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvcGF0Y2hyZWFkZXJfdW5pdHRlc3Qu cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyX3VuaXR0 ZXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjEwNzkxZTQ4NjdjYmUxNzEwYzJiNTUyMjkyOTBiYjg1YjlmZDU4 MWEKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L3BhdGNocmVhZGVyX3VuaXR0ZXN0LnB5CkBAIC0wLDAgKzEsODUgQEAKKyMhL3Vzci9iaW4vcHl0 aG9uCisjCisjIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDkgVG9yY2ggTW9iaWxlIEluYy4KKyMgQ29weXJpZ2h0 IChDKSAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChD KSAyMDEwIENocmlzIEplcmRvbmVrIChjaHJpcy5qZXJkb25la0BnbWFpbC5jb20pCisjCisjIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgKiBSZWRpc3RyaWJ1dGlv bnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisjICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAq IE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMg Y29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBk ZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0 ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09Q WVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVT UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRP LCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1Ig QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwg T1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBU TywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBV U0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorCitpbXBvcnQgdW5pdHRlc3QKKworZnJvbSB3ZWJraXRweS5zdHlsZS5wYXRjaHJl YWRlciBpbXBvcnQgUGF0Y2hSZWFkZXIKKworCitjbGFzcyBQYXRjaFJlYWRlclRlc3QodW5pdHRl c3QuVGVzdENhc2UpOgorCisgICAgIiIiVGVzdCB0aGUgUGF0Y2hSZWFkZXIgY2xhc3MuIiIiCisK KyAgICBjbGFzcyBNb2NrVGV4dEZpbGVSZWFkZXIob2JqZWN0KToKKworICAgICAgICBkZWYgX19p bml0X18oc2VsZik6CisgICAgICAgICAgICBzZWxmLnBhc3NlZF90b19wcm9jZXNzX2ZpbGUgPSBb XQorICAgICAgICAgICAgIiIiQSBsaXN0IG9mIChmaWxlX3BhdGgsIGxpbmVfbnVtYmVycykgcGFp cnMuIiIiCisKKyAgICAgICAgZGVmIHByb2Nlc3NfZmlsZShzZWxmLCBmaWxlX3BhdGgsIGxpbmVf bnVtYmVycyk6CisgICAgICAgICAgICBzZWxmLnBhc3NlZF90b19wcm9jZXNzX2ZpbGUuYXBwZW5k KChmaWxlX3BhdGgsIGxpbmVfbnVtYmVycykpCisKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAg ICAgIGZpbGVfcmVhZGVyID0gc2VsZi5Nb2NrVGV4dEZpbGVSZWFkZXIoKQorICAgICAgICBzZWxm Ll9maWxlX3JlYWRlciA9IGZpbGVfcmVhZGVyCisgICAgICAgIHNlbGYuX3BhdGNoX2NoZWNrZXIg PSBQYXRjaFJlYWRlcihmaWxlX3JlYWRlcikKKworICAgIGRlZiBfY2FsbF9jaGVja19wYXRjaChz ZWxmLCBwYXRjaF9zdHJpbmcpOgorICAgICAgICBzZWxmLl9wYXRjaF9jaGVja2VyLmNoZWNrKHBh dGNoX3N0cmluZykKKworICAgIGRlZiBfYXNzZXJ0X2NoZWNrZWQoc2VsZiwgcGFzc2VkX3RvX3By b2Nlc3NfZmlsZSk6CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYuX2ZpbGVfcmVhZGVy LnBhc3NlZF90b19wcm9jZXNzX2ZpbGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgIHBhc3Nl ZF90b19wcm9jZXNzX2ZpbGUpCisKKyAgICBkZWYgdGVzdF9jaGVja19wYXRjaChzZWxmKToKKyAg ICAgICAgIyBUaGUgbW9kaWZpZWQgbGluZV9udW1iZXJzIGFycmF5IGZvciB0aGlzIHBhdGNoIGlz OiBbMl0uCisgICAgICAgIHNlbGYuX2NhbGxfY2hlY2tfcGF0Y2goIiIiZGlmZiAtLWdpdCBhL19f aW5pdF9fLnB5IGIvX19pbml0X18ucHkKK2luZGV4IGVmNjViZWUuLmUzZGI3MGUgMTAwNjQ0Cist LS0gYS9fX2luaXRfXy5weQorKysrIGIvX19pbml0X18ucHkKK0BAIC0xLDEgKzEsMiBAQAorICMg UmVxdWlyZWQgZm9yIFB5dGhvbiB0byBzZWFyY2ggdGhpcyBkaXJlY3RvcnkgZm9yIG1vZHVsZSBm aWxlcworKyMgTmV3IGxpbmUKKyIiIikKKyAgICAgICAgc2VsZi5fYXNzZXJ0X2NoZWNrZWQoWygi X19pbml0X18ucHkiLCBzZXQoWzJdKSldKQorCisgICAgZGVmIHRlc3RfY2hlY2tfcGF0Y2hfd2l0 aF9kZWxldGlvbihzZWxmKToKKyAgICAgICAgc2VsZi5fY2FsbF9jaGVja19wYXRjaCgiIiJJbmRl eDogX19pbml0X18ucHkKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KKy0tLSBfX2luaXRfXy5weSAgKHJldmlzaW9uIDM1 OTMpCisrKysgX19pbml0X18ucHkgICh3b3JraW5nIGNvcHkpCitAQCAtMSArMCwwIEBACistZm9v YmFyCisiIiIpCisgICAgICAgICMgX21vY2tfY2hlY2tfZmlsZSBzaG91bGQgbm90IGJlIGNhbGxl ZCBmb3IgdGhlIGRlbGV0aW9uIHBhdGNoLgorICAgICAgICBzZWxmLl9hc3NlcnRfY2hlY2tlZChb XSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGVfcmVmZXJl bmNlcy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGVfcmVmZXJlbmNlcy5w eQppbmRleCAxYmYwODdkOTU0Njc4MWFmODU5Y2U2YTA0NTgxYWU0NTEwYTFjMzcyLi5iYWIzMGNh ZmM1NWJhZThjMGU3MDEyYzI5MzA2OTc3NDkyM2JhM2ZkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlX3JlZmVyZW5jZXMucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZV9yZWZlcmVuY2VzLnB5CkBAIC01NiwxNCArNTYsNiBAQCBk ZWYgZGV0ZWN0X2NoZWNrb3V0KCk6CiAgICAgcmV0dXJuIE5vbmUgaWYgc2NtIGlzIE5vbmUgZWxz ZSBXZWJLaXRDaGVja291dChzY20pCiAKIAotZGVmIHBhcnNlX3BhdGNoKHBhdGNoX3N0cmluZyk6 Ci0KLSAgICAiIiJQYXJzZSBhIHBhdGNoIHN0cmluZyBhbmQgcmV0dXJuIHRoZSBhZmZlY3RlZCBm aWxlcy4iIiIKLQotICAgIHBhdGNoID0gRGlmZlBhcnNlcihwYXRjaF9zdHJpbmcuc3BsaXRsaW5l cygpKQotICAgIHJldHVybiBwYXRjaC5maWxlcwotCi0KIGNsYXNzIFdlYktpdENoZWNrb3V0KG9i amVjdCk6CiAKICAgICAiIiJTaW1wbGUgZmFjYWRlIHRvIHRoZSBTQ00gY2xhc3MgZm9yIHVzZSBi eSBzdHlsZSBwYWNrYWdlLiIiIgo=