54228 2011-02-10 11:34:09 -0800 Fix style in KURLGooglePrivate 2011-02-10 17:01:48 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P3 Minor --- 53749 0 ctruta webkit-unassigned abarth commit-queue oldest_to_newest 349224 0 ctruta 2011-02-10 11:34:09 -0800 check-webkit-style currently fails on KURLGooglePrivate.h and KURLGoogle.cpp. 'nuff said. 349343 1 82040 ctruta 2011-02-10 13:45:17 -0800 Created attachment 82040 Patch I replaced "NULL" with "0", "'\0'" or "null" as appropriate. I kept using the (dictionary word) "null" because it makes sense to refer to the "null string", and also because it has semantic meaning in the underlying classes (e.g. CString::isNull). 349349 2 82043 ctruta 2011-02-10 13:51:38 -0800 Created attachment 82043 Patch Same patch as before, with a typo fixed. 349511 3 82043 commit-queue 2011-02-10 17:01:43 -0800 Comment on attachment 82043 Patch Clearing flags on attachment: 82043 Committed r78289: <http://trac.webkit.org/changeset/78289> 349512 4 commit-queue 2011-02-10 17:01:48 -0800 All reviewed patches have been landed. Closing bug. 82040 2011-02-10 13:45:17 -0800 2011-02-10 13:51:38 -0800 Patch wk54228.diff.submit text/plain 9157 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhODlhZTVlLi44NTU2MmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDItMDQgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHN0eWxlIGlu IEtVUkxHb29nbGVQcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NDIyOAorCisgICAgICAgIFJlcGxhY2Ugb2NjdXJyZW5jZXMgb2YgTlVMTCB3 aXRoIDAsICdcMCcgb3IgbnVsbCAoYXMgYXBwbGljYWJsZSksCisgICAgICAgIHRvIGFwcGVhc2Ug Y2hlY2std2Via2l0LXN0eWxlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBpcyBhIHN0 eWxlIGZpeC4KKworICAgICAgICAqIHBsYXRmb3JtL0tVUkxHb29nbGUuY3BwOgorICAgICAgICAq IHBsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmg6CisKIDIwMTEtMDItMTAgIERpcmsgU2NodWx6 ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1l cm1hbm4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCmluZGV4IDZkNjM3MzQu LmMxYjNlMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCkBAIC0xLDYg KzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAwNywgMjAwOCwgMjAwOSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDkg R29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOCwg MjAwOSwgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTYzLDggKzYzLDcgQEAgc3RhdGljIGNvbnN0IGlu dCBpbnZhbGlkUG9ydE51bWJlciA9IDB4RkZGRjsKIC8vIGNhbm9uaWNhbGl6ZXIuCiBjbGFzcyBL VVJMQ2hhcnNldENvbnZlcnRlciA6IHB1YmxpYyB1cmxfY2Fub246OkNoYXJzZXRDb252ZXJ0ZXIg ewogcHVibGljOgotICAgIC8vIFRoZSBlbmNvZGluZyBwYXJhbWV0ZXIgbWF5IGJlIE5VTEwsIGJ1 dCBpbiB0aGlzIGNhc2UgdGhlIG9iamVjdCBtdXN0IG5vdAotICAgIC8vIGJlIGNhbGxlZC4KKyAg ICAvLyBUaGUgZW5jb2RpbmcgcGFyYW1ldGVyIG1heSBiZSAwLCBidXQgaW4gdGhpcyBjYXNlIHRo ZSBvYmplY3QgbXVzdCBub3QgYmUgY2FsbGVkLgogICAgIEtVUkxDaGFyc2V0Q29udmVydGVyKGNv bnN0IFRleHRFbmNvZGluZyogZW5jb2RpbmcpCiAgICAgICAgIDogbV9lbmNvZGluZyhlbmNvZGlu ZykKICAgICB7CkBAIC05Niw4ICs5NSw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhc3NlcnRQcm90 b2NvbElzR29vZChjb25zdCBjaGFyKiBwcm90b2NvbCkKIH0KIAogLy8gUmV0dXJucyB0aGUgY2hh cmFjdGVycyBmb3IgdGhlIGdpdmVuIHN0cmluZywgb3IgYSBwb2ludGVyIHRvIGEgc3RhdGljIGVt cHR5Ci0vLyBzdHJpbmcgaWYgdGhlIGlucHV0IHN0cmluZyBpcyBOVUxMLiBUaGlzIHdpbGwgYWx3 YXlzIGVuc3VyZSB3ZSBoYXZlIGEgbm9uLQotLy8gTlVMTCBjaGFyYWN0ZXIgcG9pbnRlciBzaW5j ZSBSZXBsYWNlQ29tcG9uZW50cyBoYXMgc3BlY2lhbCBtZWFuaW5nIGZvciBOVUxMLgorLy8gc3Ry aW5nIGlmIHRoZSBpbnB1dCBzdHJpbmcgaXMgbnVsbC4gVGhpcyB3aWxsIGFsd2F5cyBlbnN1cmUg d2UgaGF2ZSBhIG5vbi0KKy8vIG51bGwgY2hhcmFjdGVyIHBvaW50ZXIgc2luY2UgUmVwbGFjZUNv bXBvbmVudHMgaGFzIHNwZWNpYWwgbWVhbmluZyBmb3IgbnVsbC4KIHN0YXRpYyBpbmxpbmUgY29u c3QgdXJsX3BhcnNlOjpVVEYxNkNoYXIqIENoYXJhY3RlcnNPckVtcHR5KGNvbnN0IFN0cmluZyYg c3RyKQogewogICAgIHN0YXRpYyBjb25zdCB1cmxfcGFyc2U6OlVURjE2Q2hhciB6ZXJvID0gMDsK QEAgLTIzMyw3ICsyMzIsNyBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0IEtV UkwmIGJhc2UsIGNvbnN0IGNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgc2V0QXNjaWkoQ1N0cmluZyhvdXRwdXQuZGF0YSgpLCBvdXRwdXQubGVuZ3Ro KCkpKTsKICAgICB9IGVsc2UgewotICAgICAgICAvLyBXZWJDb3JlIGV4cGVjdHMgcmVzb2x2ZWQg VVJMcyB0byBiZSBlbXB0eSByYXRoZXIgdGhhbiBOVUxMLgorICAgICAgICAvLyBXZWJDb3JlIGV4 cGVjdHMgcmVzb2x2ZWQgVVJMcyB0byBiZSBlbXB0eSByYXRoZXIgdGhhbiBudWxsLgogICAgICAg ICBzZXRVdGY4KENTdHJpbmcoIiIsIDApKTsKICAgICB9CiB9CkBAIC0yOTUsOCArMjk0LDggQEAg dm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6Y29weVRvKEtVUkxHb29nbGVQcml2YXRlKiBkZXN0KSBj b25zdAogU3RyaW5nIEtVUkxHb29nbGVQcml2YXRlOjpjb21wb25lbnRTdHJpbmcoY29uc3QgdXJs X3BhcnNlOjpDb21wb25lbnQmIGNvbXApIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lzVmFsaWQgfHwg Y29tcC5sZW4gPD0gMCkgewotICAgICAgICAvLyBLVVJMIHJldHVybnMgYSBOVUxMIHN0cmluZyBp ZiB0aGUgVVJMIGlzIGl0c2VsZiBhIE5VTEwgc3RyaW5nLCBhbmQgYW4KLSAgICAgICAgLy8gZW1w dHkgc3RyaW5nIGZvciBvdGhlciBub25leGlzdGFudCBlbnRpdGllcy4KKyAgICAgICAgLy8gS1VS TCByZXR1cm5zIGEgbnVsbCBzdHJpbmcgaWYgdGhlIFVSTCBpcyBpdHNlbGYgYSBudWxsIHN0cmlu ZywgYW5kIGFuCisgICAgICAgIC8vIGVtcHR5IHN0cmluZyBmb3Igb3RoZXIgbm9uZXhpc3RlbnQg ZW50aXRpZXMuCiAgICAgICAgIGlmICh1dGY4U3RyaW5nKCkuaXNOdWxsKCkpCiAgICAgICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CiAgICAgICAgIHJldHVybiBTdHJpbmcoIiIsIDApOwpAQCAtMzMw LDkgKzMyOSw5IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OnJlcGxhY2VDb21wb25lbnRzKGNv bnN0IFJlcGxhY2VtZW50cyYgcmVwbGFjZW1lbnRzKQogY29uc3QgU3RyaW5nJiBLVVJMR29vZ2xl UHJpdmF0ZTo6c3RyaW5nKCkgY29uc3QKIHsKICAgICBpZiAoIW1fc3RyaW5nSXNWYWxpZCkgewot ICAgICAgICAvLyBNdXN0IHNwZWNpYWwgY2FzZSB0aGUgTlVMTCBjYXNlLCBzaW5jZSBjb25zdHJ1 Y3RpbmcgdGhlCi0gICAgICAgIC8vIHN0cmluZyBsaWtlIHdlIGRvIGJlbG93IHdpbGwgZ2VuZXJh dGUgYW4gZW1wdHkgcmF0aGVyIHRoYW4KLSAgICAgICAgLy8gYSBOVUxMIHN0cmluZy4KKyAgICAg ICAgLy8gSGFuZGxlIHRoZSBudWxsIGNhc2Ugc2VwYXJhdGVseS4gT3RoZXJ3aXNlLCBjb25zdHJ1 Y3RpbmcKKyAgICAgICAgLy8gdGhlIHN0cmluZyBsaWtlIHdlIGRvIGJlbG93IHdvdWxkIGdlbmVy YXRlIHRoZSBlbXB0eSBzdHJpbmcsCisgICAgICAgIC8vIG5vdCB0aGUgbnVsbCBzdHJpbmcuCiAg ICAgICAgIGlmIChtX3V0ZjguaXNOdWxsKCkpCiAgICAgICAgICAgICBtX3N0cmluZyA9IFN0cmlu ZygpOwogICAgICAgICBlbHNlIGlmIChtX3V0ZjhJc0FTQ0lJKQpAQCAtMzQ2LDkgKzM0NSw5IEBA IGNvbnN0IFN0cmluZyYgS1VSTEdvb2dsZVByaXZhdGU6OnN0cmluZygpIGNvbnN0CiAKIC8vIEtV UkwgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAKLS8vIENyZWF0ZXMgd2l0aCBOVUxMLXRlcm1pbmF0ZWQgc3Ry aW5nIGlucHV0IHJlcHJlc2VudGluZyBhbiBhYnNvbHV0ZSBVUkwuCisvLyBDcmVhdGVzIHdpdGgg bnVsbC10ZXJtaW5hdGVkIHN0cmluZyBpbnB1dCByZXByZXNlbnRpbmcgYW4gYWJzb2x1dGUgVVJM LgogLy8gV2ViQ29yZSBnZW5lcmFsbHkgY2FsbHMgdGhpcyBvbmx5IHdpdGggaGFyZGNvZGVkIHN0 cmluZ3MsIHNvIHRoZSBpbnB1dCBpcwotLy8gQVNDSUkuIFdlIHRyZWF0IGlzIGFzIFVURi04IGp1 c3QgaW4gY2FzZS4KKy8vIEFTQ0lJLiBXZSB0cmVhdCBpdCBhcyBVVEYtOCBqdXN0IGluIGNhc2Uu CiBLVVJMOjpLVVJMKFBhcnNlZFVSTFN0cmluZ1RhZywgY29uc3QgY2hhciAqdXJsKQogewogICAg IC8vIEZJWE1FIFRoZSBNYWMgY29kZSBjaGVja3MgZm9yIGJlZ2lubmluZyB3aXRoIGEgc2xhc2gg YW5kIGNvbnZlcnRpbmcgdG8gYQpAQCAtMzU2LDcgKzM1NSw3IEBAIEtVUkw6OktVUkwoUGFyc2Vk VVJMU3RyaW5nVGFnLCBjb25zdCBjaGFyICp1cmwpCiAgICAgLy8gc3lzdGVtIGxpa2UgdGhhdC4K ICAgICBtX3VybC5pbml0KEtVUkwoKSwgdXJsLCBzdHJsZW4odXJsKSwgMCk7CiAKLSAgICAvLyBU aGUgb25lLWFyZ3VtZW50IGNvbnN0cnVjdG9ycyBzaG91bGQgbmV2ZXIgZ2VuZXJhdGUgYSBOVUxM IHN0cmluZy4KKyAgICAvLyBUaGUgb25lLWFyZ3VtZW50IGNvbnN0cnVjdG9ycyBzaG91bGQgbmV2 ZXIgZ2VuZXJhdGUgYSBudWxsIHN0cmluZy4KICAgICAvLyBUaGlzIGlzIGEgZnVubnkgcXVpcmsg b2YgS1VSTC5jcHAgKHByb2JhYmx5IGEgYnVnKSB3aGljaCB3ZSBwcmVzZXJ2ZS4KICAgICBpZiAo bV91cmwudXRmOFN0cmluZygpLmlzTnVsbCgpKQogICAgICAgICBtX3VybC5zZXRBc2NpaShDU3Ry aW5nKCIiLCAwKSk7CkBAIC0zNjUsNyArMzY0LDcgQEAgS1VSTDo6S1VSTChQYXJzZWRVUkxTdHJp bmdUYWcsIGNvbnN0IGNoYXIgKnVybCkKIC8vIEluaXRpYWxpemVzIHdpdGggYSBzdHJpbmcgcmVw cmVzZW50aW5nIGFuIGFic29sdXRlIFVSTC4gTm8gZW5jb2RpbmcKIC8vIGluZm9ybWF0aW9uIGlz IHNwZWNpZmllZC4gVGhpcyBnZW5lcmFsbHkgaGFwcGVucyB3aGVuIGEgS1VSTCBpcyBjb252ZXJ0 ZWQKIC8vIHRvIGEgc3RyaW5nIGFuZCB0aGVuIGNvbnZlcnRlZCBiYWNrLiBJbiB0aGlzIGNhc2Us IHRoZSBVUkwgaXMgYWxyZWFkeQotLy8gY2Fub25pY2FsIGFuZCBpbiBwcm9wZXIgZXNjYXBlZCBm b3JtIHNvIG5lZWRzIG5vIGVuY29kaW5nLiBXZSB0cmVhdCBpdCB3YXMKKy8vIGNhbm9uaWNhbCBh bmQgaW4gcHJvcGVyIGVzY2FwZWQgZm9ybSBzbyBuZWVkcyBubyBlbmNvZGluZy4gV2UgdHJlYXQg aXQgYXMKIC8vIFVURi04IGp1c3QgaW4gY2FzZS4KIEtVUkw6OktVUkwoUGFyc2VkVVJMU3RyaW5n VGFnLCBjb25zdCBTdHJpbmcmIHVybCkKIHsKQEAgLTUzMyw4ICs1MzIsOCBAQCBTdHJpbmcgS1VS TDo6dXNlcigpIGNvbnN0CiBTdHJpbmcgS1VSTDo6ZnJhZ21lbnRJZGVudGlmaWVyKCkgY29uc3QK IHsKICAgICAvLyBFbXB0eSBidXQgcHJlc2VudCByZWZzICgiZm9vLmNvbS9iYXIjIikgc2hvdWxk IHJlc3VsdCBpbiB0aGUgZW1wdHkKLSAgICAvLyBzdHJpbmcsIHdoaWNoIG1fdXJsLmNvbXBvbmVu dFN0cmluZyB3aWxsIHByb2R1Y2UuIE5vbmV4aXN0YW50IHJlZnMgc2hvdWxkIGJlCi0gICAgLy8g dGhlIE5VTEwgc3RyaW5nLgorICAgIC8vIHN0cmluZywgd2hpY2ggbV91cmwuY29tcG9uZW50U3Ry aW5nIHdpbGwgcHJvZHVjZS4gTm9uZXhpc3RlbnQgcmVmcworICAgIC8vIHNob3VsZCBiZSB0aGUg bnVsbCBzdHJpbmcuCiAgICAgaWYgKCFtX3VybC5tX3BhcnNlZC5yZWYuaXNfdmFsaWQoKSkKICAg ICAgICAgcmV0dXJuIFN0cmluZygpOwogCkBAIC03NDUsNyArNzQ0LDcgQEAgdm9pZCBLVVJMOjpz ZXRRdWVyeShjb25zdCBTdHJpbmcmIHF1ZXJ5KQogewogICAgIEtVUkxHb29nbGVQcml2YXRlOjpS ZXBsYWNlbWVudHMgcmVwbGFjZW1lbnRzOwogICAgIGlmIChxdWVyeS5pc051bGwoKSkgewotICAg ICAgICAvLyBLVVJMLmNwcCBzZXRzIHRvIE5VTEwgdG8gY2xlYXIgYW55IHF1ZXJ5LgorICAgICAg ICAvLyBLVVJMLmNwcCBzZXRzIHRvIG51bGwgdG8gY2xlYXIgYW55IHF1ZXJ5LgogICAgICAgICBy ZXBsYWNlbWVudHMuQ2xlYXJRdWVyeSgpOwogICAgIH0gZWxzZSBpZiAocXVlcnkubGVuZ3RoKCkg PiAwICYmIHF1ZXJ5WzBdID09ICc/JykgewogICAgICAgICAvLyBXZWJDb3JlIGV4cGVjdHMgdGhl IHF1ZXJ5IHN0cmluZyB0byBiZWdpbiB3aXRoIGEgcXVlc3Rpb24gbWFyaywgYnV0CkBAIC05NDYs NyArOTQ1LDcgQEAgU3RyaW5nIGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhjb25zdCBTdHJpbmcm IHN0cikKIH0KIAogLy8gSW4gS1VSTC5jcHAncyBpbXBsZW1lbnRhdGlvbiwgdGhpcyBpcyBjYWxs ZWQgYnkgZXZlcnkgY29tcG9uZW50IGdldHRlci4KLS8vIEl0IHdpbGwgdW5lc2NhcGUgZXZlcnkg Y2hhcmFjdGVyLCBpbmNsdWRpbmcgTlVMTC4gVGhpcyBpcyBzY2FyeSwgYW5kIG1heQorLy8gSXQg d2lsbCB1bmVzY2FwZSBldmVyeSBjaGFyYWN0ZXIsIGluY2x1ZGluZyAnXDAnLiBUaGlzIGlzIHNj YXJ5LCBhbmQgbWF5CiAvLyBjYXVzZSBzZWN1cml0eSBob2xlcy4gV2UgbmV2ZXIgY2FsbCB0aGlz IGZ1bmN0aW9uIGZvciBjb21wb25lbnRzLCBhbmQKIC8vIGp1c3QgcmV0dXJuIHRoZSBBU0NJSSB2 ZXJzaW9ucyBpbnN0ZWFkLgogLy8KQEAgLTEwMDUsMTAgKzEwMDQsMTAgQEAgYm9vbCBLVVJMOjpp c0xvY2FsRmlsZSgpIGNvbnN0CiAvLyB3aWxsIGF1dG9tYXRpY2FsbHkgZG8gdGhlIGNvcnJlY3Qg ZXNjYXBpbmcsIHRoaXMgZnVuY3Rpb24gZG9lcyBub3QgaGF2ZSB0bwogLy8gZG8gYW55IHdvcmsu CiAvLwotLy8gVGhlcmUgaXMgYSBwb3NzaWJpbGl0eSB0aGF0IGEgZnV0dXJlIGNhbGxlZCBtYXkg dXNlIHRoaXMgZnVuY3Rpb24gaW4gb3RoZXIKKy8vIFRoZXJlIGlzIGEgcG9zc2liaWxpdHkgdGhh dCBhIGZ1dHVyZSBjYWxsZXIgbWF5IHVzZSB0aGlzIGZ1bmN0aW9uIGluIG90aGVyCiAvLyB3YXlz LCBhbmQgbWF5IGV4cGVjdCB0byBnZXQgYSB2YWxpZCBVUkwgc3RyaW5nLiBUaGUgZGFuZ2Vyb3Vz IHRoaW5nIHdlIHdhbnQKLS8vIHRvIHByb3RlY3QgYWdhaW5zdCBoZXJlIGlzIGFjY2lkZW50YWxs eSBnZXR0aW5nIE5VTExzIGluIGEgc3RyaW5nIHRoYXQgaXMKLS8vIG5vdCBzdXBwb3NlZCB0byBo YXZlIE5VTExzLiBUaGVyZWZvcmUsIHdlIGVzY2FwZSBOVUxMcyBoZXJlIHRvIHByZXZlbnQgdGhp cy4KKy8vIHRvIHByb3RlY3QgYWdhaW5zdCBoZXJlIGlzIGFjY2lkZW50YWxseSBnZXR0aW5nICdc MCcgY2hhcmFjdGVycyBpbiBhIHN0cmluZworLy8gdGhhdCBpcyBub3Qgc3VwcG9zZWQgdG8gaGF2 ZSB0aGVtLiBUaGVyZWZvcmUsIHdlIGVzY2FwZSB0aGVzZSBjaGFyYWN0ZXJzLgogU3RyaW5nIGVu Y29kZVdpdGhVUkxFc2NhcGVTZXF1ZW5jZXMoY29uc3QgU3RyaW5nJiBub3RFbmNvZGVkU3RyaW5n KQogewogICAgIENTdHJpbmcgdXRmOCA9IFVURjhFbmNvZGluZygpLmVuY29kZSgKQEAgLTExMTUs NyArMTExNCw3IEBAIGJvb2wgcHJvdG9jb2xJcyhjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgY2hh ciogcHJvdG9jb2wpCiAKICAgICAvLyBDaGVjayB0aGUgc2NoZW1lIGxpa2UgR1VSTCBkb2VzLgog ICAgIHJldHVybiB1cmxfdXRpbDo6RmluZEFuZENvbXBhcmVTY2hlbWUodXJsLmNoYXJhY3RlcnMo KSwgdXJsLmxlbmd0aCgpLCAKLSAgICAgICAgcHJvdG9jb2wsIE5VTEwpOyAKKyAgICAgICAgcHJv dG9jb2wsIDApOwogfQogCiBpbmxpbmUgYm9vbCBLVVJMOjpwcm90b2NvbElzKGNvbnN0IFN0cmlu ZyYgc3RyaW5nLCBjb25zdCBjaGFyKiBwcm90b2NvbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9LVVJMR29vZ2xlUHJpdmF0ZS5oCmluZGV4IGM3MWU1NmIuLmZjZjBmYWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaApAQCAtMSw1ICsxLDUgQEAKIC8q Ci0gKiBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDksIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDksIDIwMTEgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqIAogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBA IC01Niw4ICs1Niw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICAgICAgIGNv bnN0IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZyk7CiAKICAgICAgICAgLy8gQmFja2VuZCBp bml0aWFsaXplcnMuIFRoZSBxdWVyeSBlbmNvZGluZyBwYXJhbWV0ZXJzIGFyZSBvcHRpb25hbCBh bmQgY2FuCi0gICAgICAgIC8vIGJlIE5VTEwgKHRoaXMgaW1wbGllcyBVVEYtOCkuIFRoZXNlIGlu aXRpYWxpemVycyByZXF1aXJlIHRoYXQgdGhlIG9iamVjdAotICAgICAgICAvLyBoYXMganVzdCBi ZWVuIGNyZWF0ZWQgYW5kIHRoZSBzdHJpbmdzIGFyZSBOVUxMLiBEbyBub3QgY2FsbCBvbiBhbgor ICAgICAgICAvLyBiZSAwICh0aGlzIGltcGxpZXMgVVRGLTgpLiBUaGlzIGluaXRpYWxpemVycyBy ZXF1aXJlIHRoYXQgdGhlIG9iamVjdAorICAgICAgICAvLyBoYXMganVzdCBiZWVuIGNyZWF0ZWQg YW5kIHRoZSBzdHJpbmdzIGFyZSBudWxsLiBEbyBub3QgY2FsbCBvbiBhbgogICAgICAgICAvLyBh bHJlYWR5LWNvbnN0cnVjdGVkIG9iamVjdC4KICAgICAgICAgdm9pZCBpbml0KGNvbnN0IEtVUkwm IGJhc2UsIGNvbnN0IGNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwKICAgICAgICAgICAgICAgICAg IGNvbnN0IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZyk7Cg== 82043 2011-02-10 13:51:38 -0800 2011-02-10 17:01:43 -0800 Patch wk54228.diff.submit text/plain 9158 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhODlhZTVlLi44NTU2MmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDItMDQgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHN0eWxlIGlu IEtVUkxHb29nbGVQcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NDIyOAorCisgICAgICAgIFJlcGxhY2Ugb2NjdXJyZW5jZXMgb2YgTlVMTCB3 aXRoIDAsICdcMCcgb3IgbnVsbCAoYXMgYXBwbGljYWJsZSksCisgICAgICAgIHRvIGFwcGVhc2Ug Y2hlY2std2Via2l0LXN0eWxlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBpcyBhIHN0 eWxlIGZpeC4KKworICAgICAgICAqIHBsYXRmb3JtL0tVUkxHb29nbGUuY3BwOgorICAgICAgICAq IHBsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmg6CisKIDIwMTEtMDItMTAgIERpcmsgU2NodWx6 ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1l cm1hbm4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCmluZGV4IDZkNjM3MzQu LmMxYjNlMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCkBAIC0xLDYg KzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAwNywgMjAwOCwgMjAwOSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDkg R29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOCwg MjAwOSwgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTYzLDggKzYzLDcgQEAgc3RhdGljIGNvbnN0IGlu dCBpbnZhbGlkUG9ydE51bWJlciA9IDB4RkZGRjsKIC8vIGNhbm9uaWNhbGl6ZXIuCiBjbGFzcyBL VVJMQ2hhcnNldENvbnZlcnRlciA6IHB1YmxpYyB1cmxfY2Fub246OkNoYXJzZXRDb252ZXJ0ZXIg ewogcHVibGljOgotICAgIC8vIFRoZSBlbmNvZGluZyBwYXJhbWV0ZXIgbWF5IGJlIE5VTEwsIGJ1 dCBpbiB0aGlzIGNhc2UgdGhlIG9iamVjdCBtdXN0IG5vdAotICAgIC8vIGJlIGNhbGxlZC4KKyAg ICAvLyBUaGUgZW5jb2RpbmcgcGFyYW1ldGVyIG1heSBiZSAwLCBidXQgaW4gdGhpcyBjYXNlIHRo ZSBvYmplY3QgbXVzdCBub3QgYmUgY2FsbGVkLgogICAgIEtVUkxDaGFyc2V0Q29udmVydGVyKGNv bnN0IFRleHRFbmNvZGluZyogZW5jb2RpbmcpCiAgICAgICAgIDogbV9lbmNvZGluZyhlbmNvZGlu ZykKICAgICB7CkBAIC05Niw4ICs5NSw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhc3NlcnRQcm90 b2NvbElzR29vZChjb25zdCBjaGFyKiBwcm90b2NvbCkKIH0KIAogLy8gUmV0dXJucyB0aGUgY2hh cmFjdGVycyBmb3IgdGhlIGdpdmVuIHN0cmluZywgb3IgYSBwb2ludGVyIHRvIGEgc3RhdGljIGVt cHR5Ci0vLyBzdHJpbmcgaWYgdGhlIGlucHV0IHN0cmluZyBpcyBOVUxMLiBUaGlzIHdpbGwgYWx3 YXlzIGVuc3VyZSB3ZSBoYXZlIGEgbm9uLQotLy8gTlVMTCBjaGFyYWN0ZXIgcG9pbnRlciBzaW5j ZSBSZXBsYWNlQ29tcG9uZW50cyBoYXMgc3BlY2lhbCBtZWFuaW5nIGZvciBOVUxMLgorLy8gc3Ry aW5nIGlmIHRoZSBpbnB1dCBzdHJpbmcgaXMgbnVsbC4gVGhpcyB3aWxsIGFsd2F5cyBlbnN1cmUg d2UgaGF2ZSBhIG5vbi0KKy8vIG51bGwgY2hhcmFjdGVyIHBvaW50ZXIgc2luY2UgUmVwbGFjZUNv bXBvbmVudHMgaGFzIHNwZWNpYWwgbWVhbmluZyBmb3IgbnVsbC4KIHN0YXRpYyBpbmxpbmUgY29u c3QgdXJsX3BhcnNlOjpVVEYxNkNoYXIqIENoYXJhY3RlcnNPckVtcHR5KGNvbnN0IFN0cmluZyYg c3RyKQogewogICAgIHN0YXRpYyBjb25zdCB1cmxfcGFyc2U6OlVURjE2Q2hhciB6ZXJvID0gMDsK QEAgLTIzMyw3ICsyMzIsNyBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0IEtV UkwmIGJhc2UsIGNvbnN0IGNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgc2V0QXNjaWkoQ1N0cmluZyhvdXRwdXQuZGF0YSgpLCBvdXRwdXQubGVuZ3Ro KCkpKTsKICAgICB9IGVsc2UgewotICAgICAgICAvLyBXZWJDb3JlIGV4cGVjdHMgcmVzb2x2ZWQg VVJMcyB0byBiZSBlbXB0eSByYXRoZXIgdGhhbiBOVUxMLgorICAgICAgICAvLyBXZWJDb3JlIGV4 cGVjdHMgcmVzb2x2ZWQgVVJMcyB0byBiZSBlbXB0eSByYXRoZXIgdGhhbiBudWxsLgogICAgICAg ICBzZXRVdGY4KENTdHJpbmcoIiIsIDApKTsKICAgICB9CiB9CkBAIC0yOTUsOCArMjk0LDggQEAg dm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6Y29weVRvKEtVUkxHb29nbGVQcml2YXRlKiBkZXN0KSBj b25zdAogU3RyaW5nIEtVUkxHb29nbGVQcml2YXRlOjpjb21wb25lbnRTdHJpbmcoY29uc3QgdXJs X3BhcnNlOjpDb21wb25lbnQmIGNvbXApIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lzVmFsaWQgfHwg Y29tcC5sZW4gPD0gMCkgewotICAgICAgICAvLyBLVVJMIHJldHVybnMgYSBOVUxMIHN0cmluZyBp ZiB0aGUgVVJMIGlzIGl0c2VsZiBhIE5VTEwgc3RyaW5nLCBhbmQgYW4KLSAgICAgICAgLy8gZW1w dHkgc3RyaW5nIGZvciBvdGhlciBub25leGlzdGFudCBlbnRpdGllcy4KKyAgICAgICAgLy8gS1VS TCByZXR1cm5zIGEgbnVsbCBzdHJpbmcgaWYgdGhlIFVSTCBpcyBpdHNlbGYgYSBudWxsIHN0cmlu ZywgYW5kIGFuCisgICAgICAgIC8vIGVtcHR5IHN0cmluZyBmb3Igb3RoZXIgbm9uZXhpc3RlbnQg ZW50aXRpZXMuCiAgICAgICAgIGlmICh1dGY4U3RyaW5nKCkuaXNOdWxsKCkpCiAgICAgICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CiAgICAgICAgIHJldHVybiBTdHJpbmcoIiIsIDApOwpAQCAtMzMw LDkgKzMyOSw5IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OnJlcGxhY2VDb21wb25lbnRzKGNv bnN0IFJlcGxhY2VtZW50cyYgcmVwbGFjZW1lbnRzKQogY29uc3QgU3RyaW5nJiBLVVJMR29vZ2xl UHJpdmF0ZTo6c3RyaW5nKCkgY29uc3QKIHsKICAgICBpZiAoIW1fc3RyaW5nSXNWYWxpZCkgewot ICAgICAgICAvLyBNdXN0IHNwZWNpYWwgY2FzZSB0aGUgTlVMTCBjYXNlLCBzaW5jZSBjb25zdHJ1 Y3RpbmcgdGhlCi0gICAgICAgIC8vIHN0cmluZyBsaWtlIHdlIGRvIGJlbG93IHdpbGwgZ2VuZXJh dGUgYW4gZW1wdHkgcmF0aGVyIHRoYW4KLSAgICAgICAgLy8gYSBOVUxMIHN0cmluZy4KKyAgICAg ICAgLy8gSGFuZGxlIHRoZSBudWxsIGNhc2Ugc2VwYXJhdGVseS4gT3RoZXJ3aXNlLCBjb25zdHJ1 Y3RpbmcKKyAgICAgICAgLy8gdGhlIHN0cmluZyBsaWtlIHdlIGRvIGJlbG93IHdvdWxkIGdlbmVy YXRlIHRoZSBlbXB0eSBzdHJpbmcsCisgICAgICAgIC8vIG5vdCB0aGUgbnVsbCBzdHJpbmcuCiAg ICAgICAgIGlmIChtX3V0ZjguaXNOdWxsKCkpCiAgICAgICAgICAgICBtX3N0cmluZyA9IFN0cmlu ZygpOwogICAgICAgICBlbHNlIGlmIChtX3V0ZjhJc0FTQ0lJKQpAQCAtMzQ2LDkgKzM0NSw5IEBA IGNvbnN0IFN0cmluZyYgS1VSTEdvb2dsZVByaXZhdGU6OnN0cmluZygpIGNvbnN0CiAKIC8vIEtV UkwgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAKLS8vIENyZWF0ZXMgd2l0aCBOVUxMLXRlcm1pbmF0ZWQgc3Ry aW5nIGlucHV0IHJlcHJlc2VudGluZyBhbiBhYnNvbHV0ZSBVUkwuCisvLyBDcmVhdGVzIHdpdGgg bnVsbC10ZXJtaW5hdGVkIHN0cmluZyBpbnB1dCByZXByZXNlbnRpbmcgYW4gYWJzb2x1dGUgVVJM LgogLy8gV2ViQ29yZSBnZW5lcmFsbHkgY2FsbHMgdGhpcyBvbmx5IHdpdGggaGFyZGNvZGVkIHN0 cmluZ3MsIHNvIHRoZSBpbnB1dCBpcwotLy8gQVNDSUkuIFdlIHRyZWF0IGlzIGFzIFVURi04IGp1 c3QgaW4gY2FzZS4KKy8vIEFTQ0lJLiBXZSB0cmVhdCBpdCBhcyBVVEYtOCBqdXN0IGluIGNhc2Uu CiBLVVJMOjpLVVJMKFBhcnNlZFVSTFN0cmluZ1RhZywgY29uc3QgY2hhciAqdXJsKQogewogICAg IC8vIEZJWE1FIFRoZSBNYWMgY29kZSBjaGVja3MgZm9yIGJlZ2lubmluZyB3aXRoIGEgc2xhc2gg YW5kIGNvbnZlcnRpbmcgdG8gYQpAQCAtMzU2LDcgKzM1NSw3IEBAIEtVUkw6OktVUkwoUGFyc2Vk VVJMU3RyaW5nVGFnLCBjb25zdCBjaGFyICp1cmwpCiAgICAgLy8gc3lzdGVtIGxpa2UgdGhhdC4K ICAgICBtX3VybC5pbml0KEtVUkwoKSwgdXJsLCBzdHJsZW4odXJsKSwgMCk7CiAKLSAgICAvLyBU aGUgb25lLWFyZ3VtZW50IGNvbnN0cnVjdG9ycyBzaG91bGQgbmV2ZXIgZ2VuZXJhdGUgYSBOVUxM IHN0cmluZy4KKyAgICAvLyBUaGUgb25lLWFyZ3VtZW50IGNvbnN0cnVjdG9ycyBzaG91bGQgbmV2 ZXIgZ2VuZXJhdGUgYSBudWxsIHN0cmluZy4KICAgICAvLyBUaGlzIGlzIGEgZnVubnkgcXVpcmsg b2YgS1VSTC5jcHAgKHByb2JhYmx5IGEgYnVnKSB3aGljaCB3ZSBwcmVzZXJ2ZS4KICAgICBpZiAo bV91cmwudXRmOFN0cmluZygpLmlzTnVsbCgpKQogICAgICAgICBtX3VybC5zZXRBc2NpaShDU3Ry aW5nKCIiLCAwKSk7CkBAIC0zNjUsNyArMzY0LDcgQEAgS1VSTDo6S1VSTChQYXJzZWRVUkxTdHJp bmdUYWcsIGNvbnN0IGNoYXIgKnVybCkKIC8vIEluaXRpYWxpemVzIHdpdGggYSBzdHJpbmcgcmVw cmVzZW50aW5nIGFuIGFic29sdXRlIFVSTC4gTm8gZW5jb2RpbmcKIC8vIGluZm9ybWF0aW9uIGlz IHNwZWNpZmllZC4gVGhpcyBnZW5lcmFsbHkgaGFwcGVucyB3aGVuIGEgS1VSTCBpcyBjb252ZXJ0 ZWQKIC8vIHRvIGEgc3RyaW5nIGFuZCB0aGVuIGNvbnZlcnRlZCBiYWNrLiBJbiB0aGlzIGNhc2Us IHRoZSBVUkwgaXMgYWxyZWFkeQotLy8gY2Fub25pY2FsIGFuZCBpbiBwcm9wZXIgZXNjYXBlZCBm b3JtIHNvIG5lZWRzIG5vIGVuY29kaW5nLiBXZSB0cmVhdCBpdCB3YXMKKy8vIGNhbm9uaWNhbCBh bmQgaW4gcHJvcGVyIGVzY2FwZWQgZm9ybSBzbyBuZWVkcyBubyBlbmNvZGluZy4gV2UgdHJlYXQg aXQgYXMKIC8vIFVURi04IGp1c3QgaW4gY2FzZS4KIEtVUkw6OktVUkwoUGFyc2VkVVJMU3RyaW5n VGFnLCBjb25zdCBTdHJpbmcmIHVybCkKIHsKQEAgLTUzMyw4ICs1MzIsOCBAQCBTdHJpbmcgS1VS TDo6dXNlcigpIGNvbnN0CiBTdHJpbmcgS1VSTDo6ZnJhZ21lbnRJZGVudGlmaWVyKCkgY29uc3QK IHsKICAgICAvLyBFbXB0eSBidXQgcHJlc2VudCByZWZzICgiZm9vLmNvbS9iYXIjIikgc2hvdWxk IHJlc3VsdCBpbiB0aGUgZW1wdHkKLSAgICAvLyBzdHJpbmcsIHdoaWNoIG1fdXJsLmNvbXBvbmVu dFN0cmluZyB3aWxsIHByb2R1Y2UuIE5vbmV4aXN0YW50IHJlZnMgc2hvdWxkIGJlCi0gICAgLy8g dGhlIE5VTEwgc3RyaW5nLgorICAgIC8vIHN0cmluZywgd2hpY2ggbV91cmwuY29tcG9uZW50U3Ry aW5nIHdpbGwgcHJvZHVjZS4gTm9uZXhpc3RlbnQgcmVmcworICAgIC8vIHNob3VsZCBiZSB0aGUg bnVsbCBzdHJpbmcuCiAgICAgaWYgKCFtX3VybC5tX3BhcnNlZC5yZWYuaXNfdmFsaWQoKSkKICAg ICAgICAgcmV0dXJuIFN0cmluZygpOwogCkBAIC03NDUsNyArNzQ0LDcgQEAgdm9pZCBLVVJMOjpz ZXRRdWVyeShjb25zdCBTdHJpbmcmIHF1ZXJ5KQogewogICAgIEtVUkxHb29nbGVQcml2YXRlOjpS ZXBsYWNlbWVudHMgcmVwbGFjZW1lbnRzOwogICAgIGlmIChxdWVyeS5pc051bGwoKSkgewotICAg ICAgICAvLyBLVVJMLmNwcCBzZXRzIHRvIE5VTEwgdG8gY2xlYXIgYW55IHF1ZXJ5LgorICAgICAg ICAvLyBLVVJMLmNwcCBzZXRzIHRvIG51bGwgdG8gY2xlYXIgYW55IHF1ZXJ5LgogICAgICAgICBy ZXBsYWNlbWVudHMuQ2xlYXJRdWVyeSgpOwogICAgIH0gZWxzZSBpZiAocXVlcnkubGVuZ3RoKCkg PiAwICYmIHF1ZXJ5WzBdID09ICc/JykgewogICAgICAgICAvLyBXZWJDb3JlIGV4cGVjdHMgdGhl IHF1ZXJ5IHN0cmluZyB0byBiZWdpbiB3aXRoIGEgcXVlc3Rpb24gbWFyaywgYnV0CkBAIC05NDYs NyArOTQ1LDcgQEAgU3RyaW5nIGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhjb25zdCBTdHJpbmcm IHN0cikKIH0KIAogLy8gSW4gS1VSTC5jcHAncyBpbXBsZW1lbnRhdGlvbiwgdGhpcyBpcyBjYWxs ZWQgYnkgZXZlcnkgY29tcG9uZW50IGdldHRlci4KLS8vIEl0IHdpbGwgdW5lc2NhcGUgZXZlcnkg Y2hhcmFjdGVyLCBpbmNsdWRpbmcgTlVMTC4gVGhpcyBpcyBzY2FyeSwgYW5kIG1heQorLy8gSXQg d2lsbCB1bmVzY2FwZSBldmVyeSBjaGFyYWN0ZXIsIGluY2x1ZGluZyAnXDAnLiBUaGlzIGlzIHNj YXJ5LCBhbmQgbWF5CiAvLyBjYXVzZSBzZWN1cml0eSBob2xlcy4gV2UgbmV2ZXIgY2FsbCB0aGlz IGZ1bmN0aW9uIGZvciBjb21wb25lbnRzLCBhbmQKIC8vIGp1c3QgcmV0dXJuIHRoZSBBU0NJSSB2 ZXJzaW9ucyBpbnN0ZWFkLgogLy8KQEAgLTEwMDUsMTAgKzEwMDQsMTAgQEAgYm9vbCBLVVJMOjpp c0xvY2FsRmlsZSgpIGNvbnN0CiAvLyB3aWxsIGF1dG9tYXRpY2FsbHkgZG8gdGhlIGNvcnJlY3Qg ZXNjYXBpbmcsIHRoaXMgZnVuY3Rpb24gZG9lcyBub3QgaGF2ZSB0bwogLy8gZG8gYW55IHdvcmsu CiAvLwotLy8gVGhlcmUgaXMgYSBwb3NzaWJpbGl0eSB0aGF0IGEgZnV0dXJlIGNhbGxlZCBtYXkg dXNlIHRoaXMgZnVuY3Rpb24gaW4gb3RoZXIKKy8vIFRoZXJlIGlzIGEgcG9zc2liaWxpdHkgdGhh dCBhIGZ1dHVyZSBjYWxsZXIgbWF5IHVzZSB0aGlzIGZ1bmN0aW9uIGluIG90aGVyCiAvLyB3YXlz LCBhbmQgbWF5IGV4cGVjdCB0byBnZXQgYSB2YWxpZCBVUkwgc3RyaW5nLiBUaGUgZGFuZ2Vyb3Vz IHRoaW5nIHdlIHdhbnQKLS8vIHRvIHByb3RlY3QgYWdhaW5zdCBoZXJlIGlzIGFjY2lkZW50YWxs eSBnZXR0aW5nIE5VTExzIGluIGEgc3RyaW5nIHRoYXQgaXMKLS8vIG5vdCBzdXBwb3NlZCB0byBo YXZlIE5VTExzLiBUaGVyZWZvcmUsIHdlIGVzY2FwZSBOVUxMcyBoZXJlIHRvIHByZXZlbnQgdGhp cy4KKy8vIHRvIHByb3RlY3QgYWdhaW5zdCBoZXJlIGlzIGFjY2lkZW50YWxseSBnZXR0aW5nICdc MCcgY2hhcmFjdGVycyBpbiBhIHN0cmluZworLy8gdGhhdCBpcyBub3Qgc3VwcG9zZWQgdG8gaGF2 ZSB0aGVtLiBUaGVyZWZvcmUsIHdlIGVzY2FwZSB0aGVzZSBjaGFyYWN0ZXJzLgogU3RyaW5nIGVu Y29kZVdpdGhVUkxFc2NhcGVTZXF1ZW5jZXMoY29uc3QgU3RyaW5nJiBub3RFbmNvZGVkU3RyaW5n KQogewogICAgIENTdHJpbmcgdXRmOCA9IFVURjhFbmNvZGluZygpLmVuY29kZSgKQEAgLTExMTUs NyArMTExNCw3IEBAIGJvb2wgcHJvdG9jb2xJcyhjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgY2hh ciogcHJvdG9jb2wpCiAKICAgICAvLyBDaGVjayB0aGUgc2NoZW1lIGxpa2UgR1VSTCBkb2VzLgog ICAgIHJldHVybiB1cmxfdXRpbDo6RmluZEFuZENvbXBhcmVTY2hlbWUodXJsLmNoYXJhY3RlcnMo KSwgdXJsLmxlbmd0aCgpLCAKLSAgICAgICAgcHJvdG9jb2wsIE5VTEwpOyAKKyAgICAgICAgcHJv dG9jb2wsIDApOwogfQogCiBpbmxpbmUgYm9vbCBLVVJMOjpwcm90b2NvbElzKGNvbnN0IFN0cmlu ZyYgc3RyaW5nLCBjb25zdCBjaGFyKiBwcm90b2NvbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9LVVJMR29vZ2xlUHJpdmF0ZS5oCmluZGV4IGM3MWU1NmIuLmExNDM2YWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaApAQCAtMSw1ICsxLDUgQEAKIC8q Ci0gKiBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDksIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDksIDIwMTEgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqIAogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBA IC01Niw4ICs1Niw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICAgICAgIGNv bnN0IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZyk7CiAKICAgICAgICAgLy8gQmFja2VuZCBp bml0aWFsaXplcnMuIFRoZSBxdWVyeSBlbmNvZGluZyBwYXJhbWV0ZXJzIGFyZSBvcHRpb25hbCBh bmQgY2FuCi0gICAgICAgIC8vIGJlIE5VTEwgKHRoaXMgaW1wbGllcyBVVEYtOCkuIFRoZXNlIGlu aXRpYWxpemVycyByZXF1aXJlIHRoYXQgdGhlIG9iamVjdAotICAgICAgICAvLyBoYXMganVzdCBi ZWVuIGNyZWF0ZWQgYW5kIHRoZSBzdHJpbmdzIGFyZSBOVUxMLiBEbyBub3QgY2FsbCBvbiBhbgor ICAgICAgICAvLyBiZSAwICh0aGlzIGltcGxpZXMgVVRGLTgpLiBUaGVzZSBpbml0aWFsaXplcnMg cmVxdWlyZSB0aGF0IHRoZSBvYmplY3QKKyAgICAgICAgLy8gaGFzIGp1c3QgYmVlbiBjcmVhdGVk IGFuZCB0aGUgc3RyaW5ncyBhcmUgbnVsbC4gRG8gbm90IGNhbGwgb24gYW4KICAgICAgICAgLy8g YWxyZWFkeS1jb25zdHJ1Y3RlZCBvYmplY3QuCiAgICAgICAgIHZvaWQgaW5pdChjb25zdCBLVVJM JiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGludCByZWxMZW5ndGgsCiAgICAgICAgICAgICAgICAg ICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwo=