138975 2014-11-21 11:43:18 -0800 RenderMathMLScripts isPrescript() helper should take a reference. 2014-11-21 12:42:00 -0800 1 1 1 Unclassified WebKit MathML 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue dbarton esprehn+autocc fred.wang glenn kling kondapallykalyan mrobinson oldest_to_newest 1050521 0 kling 2014-11-21 11:43:18 -0800 I was forced to do this as part of something else but don't want to clutter. Splitting out. 1050522 1 242057 kling 2014-11-21 11:44:15 -0800 Created attachment 242057 Patch 1050523 2 242058 kling 2014-11-21 11:47:52 -0800 Created attachment 242058 Patch 1050541 3 kling 2014-11-21 12:42:00 -0800 Committed r176465: <http://trac.webkit.org/changeset/176465> 242057 2014-11-21 11:44:15 -0800 2014-11-21 11:47:52 -0800 Patch bug-138975.diff text/plain 7624 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMTkyZDQ4Li4zZGI3ZmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMTEtMjEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbmRlck1hdGhNTFNjcmlwdHMgaXNQcmVzY3JpcHQoKSBoZWxwZXIgc2hvdWxkIHRha2Ug YSByZWZlcmVuY2UuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMzg5NzU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGlkeSB0aGlzIHVw IGEgYml0LCBzaW5jZSBpdCdzIG5ldmVyIGNhbGxlZCB3aXRoIGEgbnVsbCBwb2ludGVyLgorCisg ICAgICAgICogcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxTY3JpcHRzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmlzUHJlc2NyaXB0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhN TFNjcmlwdHM6OmZpeEFub255bW91c1N0eWxlcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJN YXRoTUxTY3JpcHRzOjphZGRDaGlsZEludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck1hdGhNTFNjcmlwdHM6OnJlbW92ZUNoaWxkSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTWF0aE1MU2NyaXB0czo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1h dGhNTFNjcmlwdHNXcmFwcGVyOjphZGRDaGlsZEludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVyOjpyZW1vdmVDaGlsZEludGVybmFsKToKKwogMjAx NC0xMS0yMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jl c3Npb24ocjE3NTM4MSk6IC13ZWJraXQtbWFzay1ib3gtaW1hZ2UgaXMgYnJva2VuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFNjcmlwdHMu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxTY3JpcHRz LmNwcAppbmRleCA3NGM5OWUxLi4xY2YwNGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFNjcmlwdHMuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MU2NyaXB0cy5jcHAKQEAgLTUwLDEwICs1 MCw5IEBAIHVzaW5nIG5hbWVzcGFjZSBNYXRoTUxOYW1lczsKIC8vIHdoZXJlIEJhc2VXcmFwcGVy IGNhbiBub3cgYmUgZW1wdHkgYW5kIFN1YlN1cFBhaXJXcmFwcGVyIGNhbiBub3cgaGF2ZSBvbmUg b3IgdHdvIGVsZW1lbnRzLgogLy8KIAotc3RhdGljIGJvb2wgaXNQcmVzY3JpcHQoUmVuZGVyT2Jq ZWN0KiByZW5kZXJPYmplY3QpCitzdGF0aWMgYm9vbCBpc1ByZXNjcmlwdChjb25zdCBSZW5kZXJP YmplY3QmIHJlbmRlck9iamVjdCkKIHsKLSAgICBBU1NFUlQocmVuZGVyT2JqZWN0KTsKLSAgICBy ZXR1cm4gcmVuZGVyT2JqZWN0LT5ub2RlKCkgJiYgcmVuZGVyT2JqZWN0LT5ub2RlKCktPmhhc1Rh Z05hbWUoTWF0aE1MTmFtZXM6Om1wcmVzY3JpcHRzVGFnKTsKKyAgICByZXR1cm4gcmVuZGVyT2Jq ZWN0Lm5vZGUoKSAmJiByZW5kZXJPYmplY3Qubm9kZSgpLT5oYXNUYWdOYW1lKE1hdGhNTE5hbWVz OjptcHJlc2NyaXB0c1RhZyk7CiB9CiAKIFJlbmRlck1hdGhNTFNjcmlwdHM6OlJlbmRlck1hdGhN TFNjcmlwdHMoRWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUpCkBA IC0xMTksMTIgKzExOCwxMiBAQCB2b2lkIFJlbmRlck1hdGhNTFNjcmlwdHM6OmZpeEFub255bW91 c1N0eWxlcygpCiAKICAgICAvLyBUaGlzIHNldHMgdGhlIHN0eWxlIGZvciBwb3N0c2NyaXB0IHBh aXJzLgogICAgIFJlbmRlck9iamVjdCogc3ViU3VwUGFpciA9IG1fYmFzZVdyYXBwZXI7Ci0gICAg Zm9yIChzdWJTdXBQYWlyID0gc3ViU3VwUGFpci0+bmV4dFNpYmxpbmcoKTsgc3ViU3VwUGFpciAm JiAhaXNQcmVzY3JpcHQoc3ViU3VwUGFpcik7IHN1YlN1cFBhaXIgPSBzdWJTdXBQYWlyLT5uZXh0 U2libGluZygpKQorICAgIGZvciAoc3ViU3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5n KCk7IHN1YlN1cFBhaXIgJiYgIWlzUHJlc2NyaXB0KCpzdWJTdXBQYWlyKTsgc3ViU3VwUGFpciA9 IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIGZpeEFub255bW91c1N0eWxlRm9y U3ViU3VwUGFpcihzdWJTdXBQYWlyLCB0cnVlKTsKIAogICAgIGlmIChzdWJTdXBQYWlyICYmIG1f a2luZCA9PSBNdWx0aXNjcmlwdHMpIHsKICAgICAgICAgLy8gVGhpcyBzZXRzIHRoZSBzdHlsZSBm b3IgcHJlc2NyaXB0IHBhaXJzLgotICAgICAgICBmb3IgKHN1YlN1cFBhaXIgPSBzdWJTdXBQYWly LT5uZXh0U2libGluZygpOyBzdWJTdXBQYWlyICYmICFpc1ByZXNjcmlwdChzdWJTdXBQYWlyKTsg c3ViU3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCkpCisgICAgICAgIGZvciAoc3Vi U3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCk7IHN1YlN1cFBhaXIgJiYgIWlzUHJl c2NyaXB0KCpzdWJTdXBQYWlyKTsgc3ViU3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5n KCkpCiAgICAgICAgICAgICBmaXhBbm9ueW1vdXNTdHlsZUZvclN1YlN1cFBhaXIoc3ViU3VwUGFp ciwgZmFsc2UpOwogICAgIH0KIApAQCAtMTY4LDEzICsxNjcsMTMgQEAgdm9pZCBSZW5kZXJNYXRo TUxTY3JpcHRzOjphZGRDaGlsZEludGVybmFsKGJvb2wgZG9Ob3RSZXN0cnVjdHVyZSwgUmVuZGVy T2JqZWN0KgogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIAotICAgIGlmIChpc1ByZXNjcmlw dChjaGlsZCkpIHsKKyAgICBpZiAoaXNQcmVzY3JpcHQoKmNoaWxkKSkgewogICAgICAgICAvLyBU aGUgbmV3IGNoaWxkIGJlY29tZXMgYW4gPG1wcmVzY3JpcHRzLz4gc2VwYXJhdG9yLgogICAgICAg ICBSZW5kZXJNYXRoTUxCbG9jazo6YWRkQ2hpbGQoY2hpbGQsIGJlZm9yZUNoaWxkKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmICghYmVmb3JlQ2hpbGQgfHwgaXNQcmVzY3JpcHQo YmVmb3JlQ2hpbGQpKSB7CisgICAgaWYgKCFiZWZvcmVDaGlsZCB8fCBpc1ByZXNjcmlwdCgqYmVm b3JlQ2hpbGQpKSB7CiAgICAgICAgIC8vIFdlIGFyZSBhdCB0aGUgZW5kIG9mIGEgc2VxdWVuY2Ug b2Ygc3ViU3VwIHBhaXJzLgogICAgICAgICBSZW5kZXJNYXRoTUxCbG9jayogcHJldmlvdXNTaWJs aW5nID0gZG93bmNhc3Q8UmVuZGVyTWF0aE1MQmxvY2s+KGJlZm9yZUNoaWxkID8gYmVmb3JlQ2hp bGQtPnByZXZpb3VzU2libGluZygpIDogbGFzdENoaWxkKCkpOwogICAgICAgICBpZiAoaXM8UmVu ZGVyTWF0aE1MU2NyaXB0c1dyYXBwZXI+KHByZXZpb3VzU2libGluZykpIHsKQEAgLTIwNCwxMyAr MjAzLDEzIEBAIFJlbmRlck9iamVjdCogUmVuZGVyTWF0aE1MU2NyaXB0czo6cmVtb3ZlQ2hpbGRJ bnRlcm5hbChib29sIGRvTm90UmVzdHJ1Y3R1cmUsIFJlCiAgICAgaWYgKGRvTm90UmVzdHJ1Y3R1 cmUpCiAgICAgICAgIHJldHVybiBSZW5kZXJNYXRoTUxCbG9jazo6cmVtb3ZlQ2hpbGQoY2hpbGQp OwogCi0gICAgQVNTRVJUKGlzUHJlc2NyaXB0KCZjaGlsZCkpOworICAgIEFTU0VSVChpc1ByZXNj cmlwdChjaGlsZCkpOwogCiAgICAgUmVuZGVyT2JqZWN0KiBwcmV2aW91c1NpYmxpbmcgPSBjaGls ZC5wcmV2aW91c1NpYmxpbmcoKTsKICAgICBSZW5kZXJPYmplY3QqIG5leHRTaWJsaW5nID0gY2hp bGQubmV4dFNpYmxpbmcoKTsKICAgICBBU1NFUlQocHJldmlvdXNTaWJsaW5nKTsKIAotICAgIGlm IChuZXh0U2libGluZyAmJiAhaXNQcmVzY3JpcHQocHJldmlvdXNTaWJsaW5nKSAmJiAhaXNQcmVz Y3JpcHQobmV4dFNpYmxpbmcpKSB7CisgICAgaWYgKG5leHRTaWJsaW5nICYmICFpc1ByZXNjcmlw dCgqcHJldmlvdXNTaWJsaW5nKSAmJiAhaXNQcmVzY3JpcHQoKm5leHRTaWJsaW5nKSkgewogICAg ICAgICBSZW5kZXJNYXRoTUxTY3JpcHRzV3JhcHBlciYgcHJldmlvdXNXcmFwcGVyID0gZG93bmNh c3Q8UmVuZGVyTWF0aE1MU2NyaXB0c1dyYXBwZXI+KCpwcmV2aW91c1NpYmxpbmcpOwogICAgICAg ICBSZW5kZXJNYXRoTUxTY3JpcHRzV3JhcHBlciYgbmV4dFdyYXBwZXIgPSBkb3duY2FzdDxSZW5k ZXJNYXRoTUxTY3JpcHRzV3JhcHBlcj4oKm5leHRTaWJsaW5nKTsKICAgICAgICAgQVNTRVJUKG5l eHRXcmFwcGVyLm1fa2luZCA9PSBSZW5kZXJNYXRoTUxTY3JpcHRzV3JhcHBlcjo6U3ViU3VwUGFp ciAmJiAhbmV4dFdyYXBwZXIuaXNFbXB0eSgpKTsKQEAgLTMwNiw3ICszMDUsNyBAQCB2b2lkIFJl bmRlck1hdGhNTFNjcmlwdHM6OmxheW91dCgpCiAgICAgZm9yICg7IHN1YlN1cFBhaXI7IHN1YlN1 cFBhaXIgPSBkb3duY2FzdDxSZW5kZXJNYXRoTUxCbG9jaz4oc3ViU3VwUGFpci0+bmV4dFNpYmxp bmcoKSkpIHsKIAogICAgICAgICAvLyBXZSBza2lwIHRoZSBiYXNlIGFuZCA8bXByZXNjcmlwdHMv PiBlbGVtZW50cy4KLSAgICAgICAgaWYgKGlzUHJlc2NyaXB0KHN1YlN1cFBhaXIpKSB7CisgICAg ICAgIGlmIChpc1ByZXNjcmlwdCgqc3ViU3VwUGFpcikpIHsKICAgICAgICAgICAgIGlmICghaXNQ b3N0U2NyaXB0KQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgaXNQb3N0U2Ny aXB0ID0gZmFsc2U7CkBAIC0zOTYsNyArMzk1LDcgQEAgdm9pZCBSZW5kZXJNYXRoTUxTY3JpcHRz V3JhcHBlcjo6YWRkQ2hpbGRJbnRlcm5hbChib29sIGRvTm90UmVzdHJ1Y3R1cmUsIFJlbmRlck8K ICAgICAgICAgUmVuZGVyT2JqZWN0KiBvbGRCYXNlID0gZmlyc3RDaGlsZCgpOwogICAgICAgICBp ZiAob2xkQmFzZSkKICAgICAgICAgICAgIFJlbmRlck1hdGhNTEJsb2NrOjpyZW1vdmVDaGlsZCgq b2xkQmFzZSk7Ci0gICAgICAgIGlmIChpc1ByZXNjcmlwdChjaGlsZCkpCisgICAgICAgIGlmIChp c1ByZXNjcmlwdCgqY2hpbGQpKQogICAgICAgICAgICAgcGFyZW50Tm9kZS0+YWRkQ2hpbGRJbnRl cm5hbCh0cnVlLCBjaGlsZCwgc2libGluZyk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIFJl bmRlck1hdGhNTEJsb2NrOjphZGRDaGlsZChjaGlsZCk7CkBAIC00MDUsNyArNDA0LDcgQEAgdm9p ZCBSZW5kZXJNYXRoTUxTY3JpcHRzV3JhcHBlcjo6YWRkQ2hpbGRJbnRlcm5hbChib29sIGRvTm90 UmVzdHJ1Y3R1cmUsIFJlbmRlck8KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChp c1ByZXNjcmlwdChjaGlsZCkpIHsKKyAgICBpZiAoaXNQcmVzY3JpcHQoKmNoaWxkKSkgewogICAg ICAgICAvLyBXZSBpbnNlcnQgYW4gPG1wcmVzY3JpcHRzPiBlbGVtZW50LgogICAgICAgICBpZiAo IWJlZm9yZUNoaWxkKQogICAgICAgICAgICAgcGFyZW50Tm9kZS0+YWRkQ2hpbGRJbnRlcm5hbCh0 cnVlLCBjaGlsZCwgbmV4dFNpYmxpbmcoKSk7CkBAIC00MzEsNyArNDMwLDcgQEAgdm9pZCBSZW5k ZXJNYXRoTUxTY3JpcHRzV3JhcHBlcjo6YWRkQ2hpbGRJbnRlcm5hbChib29sIGRvTm90UmVzdHJ1 Y3R1cmUsIFJlbmRlck8KIAogICAgIC8vIFdlIGZpcnN0IG1vdmUgdG8gdGhlIGxhc3Qgc3ViU3Vw IHBhaXIgaW4gdGhlIGN1cmVudCBzZXF1ZW5jZSBvZiBzY3JpcHRzLgogICAgIFJlbmRlck1hdGhN TFNjcmlwdHNXcmFwcGVyKiBzdWJTdXBQYWlyID0gdGhpczsKLSAgICB3aGlsZSAoc3ViU3VwUGFp ci0+bmV4dFNpYmxpbmcoKSAmJiAhaXNQcmVzY3JpcHQoc3ViU3VwUGFpci0+bmV4dFNpYmxpbmco KSkpCisgICAgd2hpbGUgKHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCkgJiYgIWlzUHJlc2NyaXB0 KCpzdWJTdXBQYWlyLT5uZXh0U2libGluZygpKSkKICAgICAgICAgc3ViU3VwUGFpciA9IGRvd25j YXN0PFJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVyPihzdWJTdXBQYWlyLT5uZXh0U2libGluZygp KTsKICAgICBpZiAoc3ViU3VwUGFpci0+Zmlyc3RDaGlsZCgpLT5uZXh0U2libGluZygpKSB7CiAg ICAgICAgIC8vIFRoZSBsYXN0IHBhaXIgaGFzIHR3byBjaGlsZHJlbiBzbyB3ZSBuZWVkIHRvIGNy ZWF0ZSBhIG5ldyBwYWlyIHRvIGxlYXZlIHJvb20gZm9yIHRoZSBuZXcgY2hpbGQuCkBAIC00NzMs NyArNDcyLDcgQEAgUmVuZGVyT2JqZWN0KiBSZW5kZXJNYXRoTUxTY3JpcHRzV3JhcHBlcjo6cmVt b3ZlQ2hpbGRJbnRlcm5hbChib29sIGRvTm90UmVzdHJ1Y3QKICAgICAgICAgLy8gV2UgcmVtb3Zl IHRoZSBjaGlsZCBmcm9tIHRoZSBiYXNlIHdyYXBwZXIuCiAgICAgICAgIFJlbmRlck9iamVjdCog c2libGluZyA9IG5leHRTaWJsaW5nKCk7CiAgICAgICAgIFJlbmRlck1hdGhNTEJsb2NrOjpyZW1v dmVDaGlsZChjaGlsZCk7Ci0gICAgICAgIGlmIChzaWJsaW5nICYmICFpc1ByZXNjcmlwdChzaWJs aW5nKSkgeworICAgICAgICBpZiAoc2libGluZyAmJiAhaXNQcmVzY3JpcHQoKnNpYmxpbmcpKSB7 CiAgICAgICAgICAgICAvLyBJZiB0aGVyZSBhcmUgcG9zdHNjcmlwdHMsIHRoZSBmaXJzdCBvbmUg YmVjb21lcyB0aGUgYmFzZS4KICAgICAgICAgICAgIFJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVy JiB3cmFwcGVyID0gZG93bmNhc3Q8UmVuZGVyTWF0aE1MU2NyaXB0c1dyYXBwZXI+KCpzaWJsaW5n KTsKICAgICAgICAgICAgIFJlbmRlck9iamVjdCogc2NyaXB0ID0gd3JhcHBlci5maXJzdENoaWxk KCk7CkBAIC00ODYsNyArNDg1LDcgQEAgUmVuZGVyT2JqZWN0KiBSZW5kZXJNYXRoTUxTY3JpcHRz V3JhcHBlcjo6cmVtb3ZlQ2hpbGRJbnRlcm5hbChib29sIGRvTm90UmVzdHJ1Y3QKICAgICAvLyBX ZSByZW1vdmUgdGhlIGNoaWxkIGFuZCBzaGlmdCB0aGUgc3VjY2Vzc29ycyBpbiB0aGUgY3VycmVu dCBzZXF1ZW5jZSBvZiBzY3JpcHRzLgogICAgIFJlbmRlck9iamVjdCogbmV4dCA9IFJlbmRlck1h dGhNTEJsb2NrOjpyZW1vdmVDaGlsZChjaGlsZCk7CiAgICAgUmVuZGVyTWF0aE1MU2NyaXB0c1dy YXBwZXIqIHN1YlN1cFBhaXIgPSB0aGlzOwotICAgIGZvciAoUmVuZGVyT2JqZWN0KiBuZXh0U2li bGluZyA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCk7IG5leHRTaWJsaW5nICYmICFpc1ByZXNj cmlwdChuZXh0U2libGluZyk7IG5leHRTaWJsaW5nID0gbmV4dFNpYmxpbmctPm5leHRTaWJsaW5n KCkpIHsKKyAgICBmb3IgKFJlbmRlck9iamVjdCogbmV4dFNpYmxpbmcgPSBzdWJTdXBQYWlyLT5u ZXh0U2libGluZygpOyBuZXh0U2libGluZyAmJiAhaXNQcmVzY3JpcHQoKm5leHRTaWJsaW5nKTsg bmV4dFNpYmxpbmcgPSBuZXh0U2libGluZy0+bmV4dFNpYmxpbmcoKSkgewogICAgICAgICBSZW5k ZXJNYXRoTUxTY3JpcHRzV3JhcHBlciYgbmV4dFN1YlN1cFBhaXIgPSBkb3duY2FzdDxSZW5kZXJN YXRoTUxTY3JpcHRzV3JhcHBlcj4oKm5leHRTaWJsaW5nKTsKICAgICAgICAgUmVuZGVyT2JqZWN0 KiBzY3JpcHQgPSBuZXh0U3ViU3VwUGFpci5maXJzdENoaWxkKCk7CiAgICAgICAgIG5leHRTdWJT dXBQYWlyLnJlbW92ZUNoaWxkSW50ZXJuYWwodHJ1ZSwgKnNjcmlwdCk7Cg== 242058 2014-11-21 11:47:52 -0800 2014-11-21 11:49:26 -0800 Patch bug-138975.diff text/plain 8010 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlMTkyZDQ4Li4zZGI3ZmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMTEtMjEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbmRlck1hdGhNTFNjcmlwdHMgaXNQcmVzY3JpcHQoKSBoZWxwZXIgc2hvdWxkIHRha2Ug YSByZWZlcmVuY2UuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMzg5NzU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGlkeSB0aGlzIHVw IGEgYml0LCBzaW5jZSBpdCdzIG5ldmVyIGNhbGxlZCB3aXRoIGEgbnVsbCBwb2ludGVyLgorCisg ICAgICAgICogcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxTY3JpcHRzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmlzUHJlc2NyaXB0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhN TFNjcmlwdHM6OmZpeEFub255bW91c1N0eWxlcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJN YXRoTUxTY3JpcHRzOjphZGRDaGlsZEludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck1hdGhNTFNjcmlwdHM6OnJlbW92ZUNoaWxkSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTWF0aE1MU2NyaXB0czo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1h dGhNTFNjcmlwdHNXcmFwcGVyOjphZGRDaGlsZEludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVyOjpyZW1vdmVDaGlsZEludGVybmFsKToKKwogMjAx NC0xMS0yMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jl c3Npb24ocjE3NTM4MSk6IC13ZWJraXQtbWFzay1ib3gtaW1hZ2UgaXMgYnJva2VuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFNjcmlwdHMu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxTY3JpcHRz LmNwcAppbmRleCA3NGM5OWUxLi4zZTljZWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFNjcmlwdHMuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MU2NyaXB0cy5jcHAKQEAgLTUwLDEwICs1 MCw5IEBAIHVzaW5nIG5hbWVzcGFjZSBNYXRoTUxOYW1lczsKIC8vIHdoZXJlIEJhc2VXcmFwcGVy IGNhbiBub3cgYmUgZW1wdHkgYW5kIFN1YlN1cFBhaXJXcmFwcGVyIGNhbiBub3cgaGF2ZSBvbmUg b3IgdHdvIGVsZW1lbnRzLgogLy8KIAotc3RhdGljIGJvb2wgaXNQcmVzY3JpcHQoUmVuZGVyT2Jq ZWN0KiByZW5kZXJPYmplY3QpCitzdGF0aWMgYm9vbCBpc1ByZXNjcmlwdChjb25zdCBSZW5kZXJP YmplY3QmIHJlbmRlck9iamVjdCkKIHsKLSAgICBBU1NFUlQocmVuZGVyT2JqZWN0KTsKLSAgICBy ZXR1cm4gcmVuZGVyT2JqZWN0LT5ub2RlKCkgJiYgcmVuZGVyT2JqZWN0LT5ub2RlKCktPmhhc1Rh Z05hbWUoTWF0aE1MTmFtZXM6Om1wcmVzY3JpcHRzVGFnKTsKKyAgICByZXR1cm4gcmVuZGVyT2Jq ZWN0Lm5vZGUoKSAmJiByZW5kZXJPYmplY3Qubm9kZSgpLT5oYXNUYWdOYW1lKE1hdGhNTE5hbWVz OjptcHJlc2NyaXB0c1RhZyk7CiB9CiAKIFJlbmRlck1hdGhNTFNjcmlwdHM6OlJlbmRlck1hdGhN TFNjcmlwdHMoRWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUpCkBA IC0xMTksMTggKzExOCwxOCBAQCB2b2lkIFJlbmRlck1hdGhNTFNjcmlwdHM6OmZpeEFub255bW91 c1N0eWxlcygpCiAKICAgICAvLyBUaGlzIHNldHMgdGhlIHN0eWxlIGZvciBwb3N0c2NyaXB0IHBh aXJzLgogICAgIFJlbmRlck9iamVjdCogc3ViU3VwUGFpciA9IG1fYmFzZVdyYXBwZXI7Ci0gICAg Zm9yIChzdWJTdXBQYWlyID0gc3ViU3VwUGFpci0+bmV4dFNpYmxpbmcoKTsgc3ViU3VwUGFpciAm JiAhaXNQcmVzY3JpcHQoc3ViU3VwUGFpcik7IHN1YlN1cFBhaXIgPSBzdWJTdXBQYWlyLT5uZXh0 U2libGluZygpKQorICAgIGZvciAoc3ViU3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5n KCk7IHN1YlN1cFBhaXIgJiYgIWlzUHJlc2NyaXB0KCpzdWJTdXBQYWlyKTsgc3ViU3VwUGFpciA9 IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIGZpeEFub255bW91c1N0eWxlRm9y U3ViU3VwUGFpcihzdWJTdXBQYWlyLCB0cnVlKTsKIAogICAgIGlmIChzdWJTdXBQYWlyICYmIG1f a2luZCA9PSBNdWx0aXNjcmlwdHMpIHsKICAgICAgICAgLy8gVGhpcyBzZXRzIHRoZSBzdHlsZSBm b3IgcHJlc2NyaXB0IHBhaXJzLgotICAgICAgICBmb3IgKHN1YlN1cFBhaXIgPSBzdWJTdXBQYWly LT5uZXh0U2libGluZygpOyBzdWJTdXBQYWlyICYmICFpc1ByZXNjcmlwdChzdWJTdXBQYWlyKTsg c3ViU3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCkpCisgICAgICAgIGZvciAoc3Vi U3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCk7IHN1YlN1cFBhaXIgJiYgIWlzUHJl c2NyaXB0KCpzdWJTdXBQYWlyKTsgc3ViU3VwUGFpciA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5n KCkpCiAgICAgICAgICAgICBmaXhBbm9ueW1vdXNTdHlsZUZvclN1YlN1cFBhaXIoc3ViU3VwUGFp ciwgZmFsc2UpOwogICAgIH0KIAogICAgIC8vIFRoaXMgcmVzZXRzIHN0eWxlIGZvciBleHRyYSBz dWJTdXAgcGFpcnMuCiAgICAgZm9yICg7IHN1YlN1cFBhaXI7IHN1YlN1cFBhaXIgPSBzdWJTdXBQ YWlyLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgIGlmICghaXNQcmVzY3JpcHQoc3ViU3VwUGFp cikpIHsKKyAgICAgICAgaWYgKCFpc1ByZXNjcmlwdCgqc3ViU3VwUGFpcikpIHsKICAgICAgICAg ICAgIEFTU0VSVChzdWJTdXBQYWlyICYmIHN1YlN1cFBhaXItPnN0eWxlKCkucmVmQ291bnQoKSA9 PSAxKTsKICAgICAgICAgICAgIFJlbmRlclN0eWxlJiBzY3JpcHRzU3R5bGUgPSBzdWJTdXBQYWly LT5zdHlsZSgpOwogICAgICAgICAgICAgc2NyaXB0c1N0eWxlLnNldEZsZXhEaXJlY3Rpb24oRmxv d1Jvdyk7CkBAIC0xNjgsMTMgKzE2NywxMyBAQCB2b2lkIFJlbmRlck1hdGhNTFNjcmlwdHM6OmFk ZENoaWxkSW50ZXJuYWwoYm9vbCBkb05vdFJlc3RydWN0dXJlLCBSZW5kZXJPYmplY3QqCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgaWYgKGlzUHJlc2NyaXB0KGNoaWxkKSkgewor ICAgIGlmIChpc1ByZXNjcmlwdCgqY2hpbGQpKSB7CiAgICAgICAgIC8vIFRoZSBuZXcgY2hpbGQg YmVjb21lcyBhbiA8bXByZXNjcmlwdHMvPiBzZXBhcmF0b3IuCiAgICAgICAgIFJlbmRlck1hdGhN TEJsb2NrOjphZGRDaGlsZChjaGlsZCwgYmVmb3JlQ2hpbGQpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgaWYgKCFiZWZvcmVDaGlsZCB8fCBpc1ByZXNjcmlwdChiZWZvcmVDaGlsZCkp IHsKKyAgICBpZiAoIWJlZm9yZUNoaWxkIHx8IGlzUHJlc2NyaXB0KCpiZWZvcmVDaGlsZCkpIHsK ICAgICAgICAgLy8gV2UgYXJlIGF0IHRoZSBlbmQgb2YgYSBzZXF1ZW5jZSBvZiBzdWJTdXAgcGFp cnMuCiAgICAgICAgIFJlbmRlck1hdGhNTEJsb2NrKiBwcmV2aW91c1NpYmxpbmcgPSBkb3duY2Fz dDxSZW5kZXJNYXRoTUxCbG9jaz4oYmVmb3JlQ2hpbGQgPyBiZWZvcmVDaGlsZC0+cHJldmlvdXNT aWJsaW5nKCkgOiBsYXN0Q2hpbGQoKSk7CiAgICAgICAgIGlmIChpczxSZW5kZXJNYXRoTUxTY3Jp cHRzV3JhcHBlcj4ocHJldmlvdXNTaWJsaW5nKSkgewpAQCAtMjA0LDEzICsyMDMsMTMgQEAgUmVu ZGVyT2JqZWN0KiBSZW5kZXJNYXRoTUxTY3JpcHRzOjpyZW1vdmVDaGlsZEludGVybmFsKGJvb2wg ZG9Ob3RSZXN0cnVjdHVyZSwgUmUKICAgICBpZiAoZG9Ob3RSZXN0cnVjdHVyZSkKICAgICAgICAg cmV0dXJuIFJlbmRlck1hdGhNTEJsb2NrOjpyZW1vdmVDaGlsZChjaGlsZCk7CiAKLSAgICBBU1NF UlQoaXNQcmVzY3JpcHQoJmNoaWxkKSk7CisgICAgQVNTRVJUKGlzUHJlc2NyaXB0KGNoaWxkKSk7 CiAKICAgICBSZW5kZXJPYmplY3QqIHByZXZpb3VzU2libGluZyA9IGNoaWxkLnByZXZpb3VzU2li bGluZygpOwogICAgIFJlbmRlck9iamVjdCogbmV4dFNpYmxpbmcgPSBjaGlsZC5uZXh0U2libGlu ZygpOwogICAgIEFTU0VSVChwcmV2aW91c1NpYmxpbmcpOwogCi0gICAgaWYgKG5leHRTaWJsaW5n ICYmICFpc1ByZXNjcmlwdChwcmV2aW91c1NpYmxpbmcpICYmICFpc1ByZXNjcmlwdChuZXh0U2li bGluZykpIHsKKyAgICBpZiAobmV4dFNpYmxpbmcgJiYgIWlzUHJlc2NyaXB0KCpwcmV2aW91c1Np YmxpbmcpICYmICFpc1ByZXNjcmlwdCgqbmV4dFNpYmxpbmcpKSB7CiAgICAgICAgIFJlbmRlck1h dGhNTFNjcmlwdHNXcmFwcGVyJiBwcmV2aW91c1dyYXBwZXIgPSBkb3duY2FzdDxSZW5kZXJNYXRo TUxTY3JpcHRzV3JhcHBlcj4oKnByZXZpb3VzU2libGluZyk7CiAgICAgICAgIFJlbmRlck1hdGhN TFNjcmlwdHNXcmFwcGVyJiBuZXh0V3JhcHBlciA9IGRvd25jYXN0PFJlbmRlck1hdGhNTFNjcmlw dHNXcmFwcGVyPigqbmV4dFNpYmxpbmcpOwogICAgICAgICBBU1NFUlQobmV4dFdyYXBwZXIubV9r aW5kID09IFJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVyOjpTdWJTdXBQYWlyICYmICFuZXh0V3Jh cHBlci5pc0VtcHR5KCkpOwpAQCAtMzA2LDcgKzMwNSw3IEBAIHZvaWQgUmVuZGVyTWF0aE1MU2Ny aXB0czo6bGF5b3V0KCkKICAgICBmb3IgKDsgc3ViU3VwUGFpcjsgc3ViU3VwUGFpciA9IGRvd25j YXN0PFJlbmRlck1hdGhNTEJsb2NrPihzdWJTdXBQYWlyLT5uZXh0U2libGluZygpKSkgewogCiAg ICAgICAgIC8vIFdlIHNraXAgdGhlIGJhc2UgYW5kIDxtcHJlc2NyaXB0cy8+IGVsZW1lbnRzLgot ICAgICAgICBpZiAoaXNQcmVzY3JpcHQoc3ViU3VwUGFpcikpIHsKKyAgICAgICAgaWYgKGlzUHJl c2NyaXB0KCpzdWJTdXBQYWlyKSkgewogICAgICAgICAgICAgaWYgKCFpc1Bvc3RTY3JpcHQpCiAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBpc1Bvc3RTY3JpcHQgPSBmYWxzZTsK QEAgLTM5Niw3ICszOTUsNyBAQCB2b2lkIFJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVyOjphZGRD aGlsZEludGVybmFsKGJvb2wgZG9Ob3RSZXN0cnVjdHVyZSwgUmVuZGVyTwogICAgICAgICBSZW5k ZXJPYmplY3QqIG9sZEJhc2UgPSBmaXJzdENoaWxkKCk7CiAgICAgICAgIGlmIChvbGRCYXNlKQog ICAgICAgICAgICAgUmVuZGVyTWF0aE1MQmxvY2s6OnJlbW92ZUNoaWxkKCpvbGRCYXNlKTsKLSAg ICAgICAgaWYgKGlzUHJlc2NyaXB0KGNoaWxkKSkKKyAgICAgICAgaWYgKGlzUHJlc2NyaXB0KCpj aGlsZCkpCiAgICAgICAgICAgICBwYXJlbnROb2RlLT5hZGRDaGlsZEludGVybmFsKHRydWUsIGNo aWxkLCBzaWJsaW5nKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgUmVuZGVyTWF0aE1MQmxv Y2s6OmFkZENoaWxkKGNoaWxkKTsKQEAgLTQwNSw3ICs0MDQsNyBAQCB2b2lkIFJlbmRlck1hdGhN TFNjcmlwdHNXcmFwcGVyOjphZGRDaGlsZEludGVybmFsKGJvb2wgZG9Ob3RSZXN0cnVjdHVyZSwg UmVuZGVyTwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKGlzUHJlc2NyaXB0KGNo aWxkKSkgeworICAgIGlmIChpc1ByZXNjcmlwdCgqY2hpbGQpKSB7CiAgICAgICAgIC8vIFdlIGlu c2VydCBhbiA8bXByZXNjcmlwdHM+IGVsZW1lbnQuCiAgICAgICAgIGlmICghYmVmb3JlQ2hpbGQp CiAgICAgICAgICAgICBwYXJlbnROb2RlLT5hZGRDaGlsZEludGVybmFsKHRydWUsIGNoaWxkLCBu ZXh0U2libGluZygpKTsKQEAgLTQzMSw3ICs0MzAsNyBAQCB2b2lkIFJlbmRlck1hdGhNTFNjcmlw dHNXcmFwcGVyOjphZGRDaGlsZEludGVybmFsKGJvb2wgZG9Ob3RSZXN0cnVjdHVyZSwgUmVuZGVy TwogCiAgICAgLy8gV2UgZmlyc3QgbW92ZSB0byB0aGUgbGFzdCBzdWJTdXAgcGFpciBpbiB0aGUg Y3VyZW50IHNlcXVlbmNlIG9mIHNjcmlwdHMuCiAgICAgUmVuZGVyTWF0aE1MU2NyaXB0c1dyYXBw ZXIqIHN1YlN1cFBhaXIgPSB0aGlzOwotICAgIHdoaWxlIChzdWJTdXBQYWlyLT5uZXh0U2libGlu ZygpICYmICFpc1ByZXNjcmlwdChzdWJTdXBQYWlyLT5uZXh0U2libGluZygpKSkKKyAgICB3aGls ZSAoc3ViU3VwUGFpci0+bmV4dFNpYmxpbmcoKSAmJiAhaXNQcmVzY3JpcHQoKnN1YlN1cFBhaXIt Pm5leHRTaWJsaW5nKCkpKQogICAgICAgICBzdWJTdXBQYWlyID0gZG93bmNhc3Q8UmVuZGVyTWF0 aE1MU2NyaXB0c1dyYXBwZXI+KHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCkpOwogICAgIGlmIChz dWJTdXBQYWlyLT5maXJzdENoaWxkKCktPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgLy8gVGhl IGxhc3QgcGFpciBoYXMgdHdvIGNoaWxkcmVuIHNvIHdlIG5lZWQgdG8gY3JlYXRlIGEgbmV3IHBh aXIgdG8gbGVhdmUgcm9vbSBmb3IgdGhlIG5ldyBjaGlsZC4KQEAgLTQ3Myw3ICs0NzIsNyBAQCBS ZW5kZXJPYmplY3QqIFJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVyOjpyZW1vdmVDaGlsZEludGVy bmFsKGJvb2wgZG9Ob3RSZXN0cnVjdAogICAgICAgICAvLyBXZSByZW1vdmUgdGhlIGNoaWxkIGZy b20gdGhlIGJhc2Ugd3JhcHBlci4KICAgICAgICAgUmVuZGVyT2JqZWN0KiBzaWJsaW5nID0gbmV4 dFNpYmxpbmcoKTsKICAgICAgICAgUmVuZGVyTWF0aE1MQmxvY2s6OnJlbW92ZUNoaWxkKGNoaWxk KTsKLSAgICAgICAgaWYgKHNpYmxpbmcgJiYgIWlzUHJlc2NyaXB0KHNpYmxpbmcpKSB7CisgICAg ICAgIGlmIChzaWJsaW5nICYmICFpc1ByZXNjcmlwdCgqc2libGluZykpIHsKICAgICAgICAgICAg IC8vIElmIHRoZXJlIGFyZSBwb3N0c2NyaXB0cywgdGhlIGZpcnN0IG9uZSBiZWNvbWVzIHRoZSBi YXNlLgogICAgICAgICAgICAgUmVuZGVyTWF0aE1MU2NyaXB0c1dyYXBwZXImIHdyYXBwZXIgPSBk b3duY2FzdDxSZW5kZXJNYXRoTUxTY3JpcHRzV3JhcHBlcj4oKnNpYmxpbmcpOwogICAgICAgICAg ICAgUmVuZGVyT2JqZWN0KiBzY3JpcHQgPSB3cmFwcGVyLmZpcnN0Q2hpbGQoKTsKQEAgLTQ4Niw3 ICs0ODUsNyBAQCBSZW5kZXJPYmplY3QqIFJlbmRlck1hdGhNTFNjcmlwdHNXcmFwcGVyOjpyZW1v dmVDaGlsZEludGVybmFsKGJvb2wgZG9Ob3RSZXN0cnVjdAogICAgIC8vIFdlIHJlbW92ZSB0aGUg Y2hpbGQgYW5kIHNoaWZ0IHRoZSBzdWNjZXNzb3JzIGluIHRoZSBjdXJyZW50IHNlcXVlbmNlIG9m IHNjcmlwdHMuCiAgICAgUmVuZGVyT2JqZWN0KiBuZXh0ID0gUmVuZGVyTWF0aE1MQmxvY2s6OnJl bW92ZUNoaWxkKGNoaWxkKTsKICAgICBSZW5kZXJNYXRoTUxTY3JpcHRzV3JhcHBlciogc3ViU3Vw UGFpciA9IHRoaXM7Ci0gICAgZm9yIChSZW5kZXJPYmplY3QqIG5leHRTaWJsaW5nID0gc3ViU3Vw UGFpci0+bmV4dFNpYmxpbmcoKTsgbmV4dFNpYmxpbmcgJiYgIWlzUHJlc2NyaXB0KG5leHRTaWJs aW5nKTsgbmV4dFNpYmxpbmcgPSBuZXh0U2libGluZy0+bmV4dFNpYmxpbmcoKSkgeworICAgIGZv ciAoUmVuZGVyT2JqZWN0KiBuZXh0U2libGluZyA9IHN1YlN1cFBhaXItPm5leHRTaWJsaW5nKCk7 IG5leHRTaWJsaW5nICYmICFpc1ByZXNjcmlwdCgqbmV4dFNpYmxpbmcpOyBuZXh0U2libGluZyA9 IG5leHRTaWJsaW5nLT5uZXh0U2libGluZygpKSB7CiAgICAgICAgIFJlbmRlck1hdGhNTFNjcmlw dHNXcmFwcGVyJiBuZXh0U3ViU3VwUGFpciA9IGRvd25jYXN0PFJlbmRlck1hdGhNTFNjcmlwdHNX cmFwcGVyPigqbmV4dFNpYmxpbmcpOwogICAgICAgICBSZW5kZXJPYmplY3QqIHNjcmlwdCA9IG5l eHRTdWJTdXBQYWlyLmZpcnN0Q2hpbGQoKTsKICAgICAgICAgbmV4dFN1YlN1cFBhaXIucmVtb3Zl Q2hpbGRJbnRlcm5hbCh0cnVlLCAqc2NyaXB0KTsK