6297 2005-12-30 00:14:55 -0800 XMLSerializer should use createMarkup 2019-02-06 09:03:15 -0800 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 andersca andersca cdumez oldest_to_newest 27215 0 andersca 2005-12-30 00:14:55 -0800 Since we're trying to get rid of NodeImpl::toString, we should use createMarkup in XMLSerializer 27226 1 5375 andersca 2005-12-30 01:52:47 -0800 Created attachment 5375 Fix some bugs in createMarkup, and make xmlserializer use it 27228 2 5375 eric 2005-12-30 02:05:29 -0800 Comment on attachment 5375 Fix some bugs in createMarkup, and make xmlserializer use it We talked about this on irc. You were going to rename escapeHTML to something like escapeTextForMarkup when landing. Also, I'm not 100% convinced that we really have enough XMLSerializer tests to know that this change won't break anything. Finally, this might have changed one more test case xsltprocessor.html which should be testing for a document fragment containing only a text node (6180 I think?). Assuming you feel the test cases are sufficent, r=me. Thanks for another great patch! 1502934 3 lforschler 2019-02-06 09:03:15 -0800 Mass moving XML DOM bugs to the "DOM" Component. 5375 2005-12-30 01:52:47 -0800 2005-12-30 02:05:29 -0800 Fix some bugs in createMarkup, and make xmlserializer use it xmlserializer-createmarkup.txt text/plain 9580 andersca SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIwNwpkaWZm IC1wIC11IC1yMS4yMDcgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCi0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJMzAgRGVjIDIwMDUgMDk6Mjc6MTkgLTAwMDAJMS4yMDcKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkzMCBEZWMgMjAwNSAwOTo1MDozOCAtMDAwMApAQCAtMSwzICsxLDE4IEBACisyMDA1 LTEyLTMwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBtYWMuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisJCS0gVXBkYXRlIHRlc3RzIGZvciBodHRwOi8v YnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTcKKwkJWE1MU2VyaWFs aXplciBzaG91bGQgdXNlIGNyZWF0ZU1hcmt1cAorCQkKKyAgICAgICAgKiBmYXN0L2RvbS9YTUxT ZXJpYWxpemVyLmh0bWw6CisgICAgICAgICogZmFzdC9kb20vWE1MU2VyaWFsaXplci1leHBlY3Rl ZC50eHQ6CisJCUNyZWF0ZSBhIGRvY3VtZW50IGZyYWdtZW50IGFuZCBzZXJpYWxpemUgaXQuCisJ CQorICAgICAgICAqIGZhc3QvZG9tL2RvbS1wYXJzZS1zZXJpYWxpemUuaHRtbDoKKyAgICAgICAg KiBmYXN0L2RvbS9kb20tcGFyc2Utc2VyaWFsaXplLWV4cGVjdGVkLnR4dDoKKwkJQWRkIHNvbWUg ZW50aXRpZXMgdG8gYXR0cmlidXRlcyBhbmQgdGV4dCBub2Rlcy4KKwogMjAwNS0xMi0zMCAgRXJp YyBTZWlkZWwgIDxlc2VpZGVsQGFwcGxlLmNvbT4KIAogICAgICAgICBObyByZXZpZXcsIGp1c3Qg YWRkaW5nIGEgY291cGxlIG1pc3NpbmcgcmVzdWx0cy4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv ZG9tL1hNTFNlcmlhbGl6ZXItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMv cm9vdC9MYXlvdXRUZXN0cy9mYXN0L2RvbS9YTUxTZXJpYWxpemVyLWV4cGVjdGVkLnR4dCx2CnJl dHJpZXZpbmcgcmV2aXNpb24gMS4xCmRpZmYgLXAgLXUgLXIxLjEgTGF5b3V0VGVzdHMvZmFzdC9k b20vWE1MU2VyaWFsaXplci1leHBlY3RlZC50eHQKLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL1hN TFNlcmlhbGl6ZXItZXhwZWN0ZWQudHh0CTkgQXVnIDIwMDUgMTk6MTU6NTYgLTAwMDAJMS4xCisr KyBMYXlvdXRUZXN0cy9mYXN0L2RvbS9YTUxTZXJpYWxpemVyLWV4cGVjdGVkLnR4dAkzMCBEZWMg MjAwNSAwOTo1MDo0NiAtMDAwMApAQCAtMSw2ICsxLDcgQEAKLVRoaXMgdGVzdHMgWE1MU2VyaWFs aXplciBvbiBkaWZmZXJlbnQgbm9kZSB0eXBlcy4gSWYgdGhlIHRlc3QgaXMgc3VjY2Vzc2Z1bCwg dGhlcmUgc2hvdWxkIGJlIGZvdXIgbGluZXMgb2Ygb3V0cHV0LiBUaGUgZmlyc3QgbGluZSBzaG91 bGQgYmUgdGhlIGNoaWxkMSB0YWcuIFRoZSBzZWNvbmQgc2hvdWxkIGJlIHRoZSBjaGlsZDIgdGFn LiBUaGUgdGhpcmQgb25lIHNob3VsZCBiZSBhIGNvbW1lbnQgYW5kIHRoZSBmb3VydGggb25lIHNo b3VsZCBiZSB0aGUgY29tcGxldGUgZG9jdW1lbnQuCitUaGlzIHRlc3RzIFhNTFNlcmlhbGl6ZXIg b24gZGlmZmVyZW50IG5vZGUgdHlwZXMuIElmIHRoZSB0ZXN0IGlzIHN1Y2Nlc3NmdWwsIHRoZXJl IHNob3VsZCBiZSBmb3VyIGxpbmVzIG9mIG91dHB1dC4gVGhlIGZpcnN0IGxpbmUgc2hvdWxkIGJl IHRoZSBjaGlsZDEgdGFnLiBUaGUgc2Vjb25kIHNob3VsZCBiZSB0aGUgY2hpbGQyIHRhZy4gVGhl IHRoaXJkIG9uZSBzaG91bGQgYmUgYSBjb21tZW50LCB0aGUgZm91cnRoIG9uZSBzaG91bGQgYmUg dGhlIGNvbXBsZXRlIGRvY3VtZW50IGFuZCB0aGUgZmlmdGggb25lIHNob3VsZCBiZSB0aGUgY29t cGxldGUgZG9jdW1lbnQgYnV0IHNlcmlhbGl6ZWQgZnJvbSBhIGRvY3VtZW50IGZyYWdtZW50IG5v ZGUuCiA8Y2hpbGQxPkZpcnN0IGNoaWxkPC9jaGlsZDE+CiA8Y2hpbGQyIGF0dHI9ImFuIGF0dHJp YnV0ZSI+U2Vjb25kIGNoaWxkPC9jaGlsZDI+CiA8IS0tIEEgY29tbWVudCAtLT4KIDx0ZXN0Pjxj aGlsZDE+Rmlyc3QgY2hpbGQ8L2NoaWxkMT48Y2hpbGQyIGF0dHI9ImFuIGF0dHJpYnV0ZSI+U2Vj b25kIGNoaWxkPC9jaGlsZDI+PCEtLSBBIGNvbW1lbnQgLS0+PC90ZXN0PgorPHRlc3Q+PGNoaWxk MT5GaXJzdCBjaGlsZDwvY2hpbGQxPjxjaGlsZDIgYXR0cj0iYW4gYXR0cmlidXRlIj5TZWNvbmQg Y2hpbGQ8L2NoaWxkMj48IS0tIEEgY29tbWVudCAtLT48L3Rlc3Q+CiAKSW5kZXg6IExheW91dFRl c3RzL2Zhc3QvZG9tL1hNTFNlcmlhbGl6ZXIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zz L3Jvb3QvTGF5b3V0VGVzdHMvZmFzdC9kb20vWE1MU2VyaWFsaXplci5odG1sLHYKcmV0cmlldmlu ZyByZXZpc2lvbiAxLjEKZGlmZiAtcCAtdSAtcjEuMSBMYXlvdXRUZXN0cy9mYXN0L2RvbS9YTUxT ZXJpYWxpemVyLmh0bWwKLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL1hNTFNlcmlhbGl6ZXIuaHRt bAk5IEF1ZyAyMDA1IDE5OjE1OjU3IC0wMDAwCTEuMQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20v WE1MU2VyaWFsaXplci5odG1sCTMwIERlYyAyMDA1IDA5OjUwOjQ2IC0wMDAwCkBAIC0zMCwxOCAr MzAsMjMgQEAgZnVuY3Rpb24gcnVuVGVzdHMoKSB7CiAJY2hpbGQyID0gY2hpbGQxLm5leHRTaWJs aW5nCiAJY29tbWVudCA9IGNoaWxkMi5uZXh0U2libGluZzsKIAkKKwlmcmFnbWVudCA9IGRvYy5j cmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CisJZnJhZ21lbnQuYXBwZW5kQ2hpbGQoZG9jLmRvY3Vt ZW50RWxlbWVudC5jbG9uZU5vZGUodHJ1ZSkpCisJCiAJc2VyaWFsaXplciA9IG5ldyBYTUxTZXJp YWxpemVyKCk7CiAJCiAJZGVidWcoc2VyaWFsaXplci5zZXJpYWxpemVUb1N0cmluZyhjaGlsZDEp KTsKIAlkZWJ1ZyhzZXJpYWxpemVyLnNlcmlhbGl6ZVRvU3RyaW5nKGNoaWxkMikpOwogCWRlYnVn KHNlcmlhbGl6ZXIuc2VyaWFsaXplVG9TdHJpbmcoY29tbWVudCkpOwkKIAlkZWJ1ZyhzZXJpYWxp emVyLnNlcmlhbGl6ZVRvU3RyaW5nKGRvYykpOworCWRlYnVnKHNlcmlhbGl6ZXIuc2VyaWFsaXpl VG9TdHJpbmcoZnJhZ21lbnQpKTsKKwkKIH0KIAogPC9zY3JpcHQ+CiA8L2hlYWQ+CiA8Ym9keSBv bmxvYWQ9InJ1blRlc3RzKCkiPgotVGhpcyB0ZXN0cyBYTUxTZXJpYWxpemVyIG9uIGRpZmZlcmVu dCBub2RlIHR5cGVzLiBJZiB0aGUgdGVzdCBpcyBzdWNjZXNzZnVsLCB0aGVyZSBzaG91bGQgYmUg Zm91ciBsaW5lcyBvZiBvdXRwdXQuIFRoZSBmaXJzdCBsaW5lIHNob3VsZCBiZSB0aGUgY2hpbGQx IHRhZy4gVGhlIHNlY29uZCBzaG91bGQgYmUgdGhlIGNoaWxkMiB0YWcuIFRoZSB0aGlyZCBvbmUg c2hvdWxkIGJlIGEgY29tbWVudCBhbmQgdGhlIGZvdXJ0aCBvbmUgc2hvdWxkIGJlIHRoZSBjb21w bGV0ZSBkb2N1bWVudC4KK1RoaXMgdGVzdHMgWE1MU2VyaWFsaXplciBvbiBkaWZmZXJlbnQgbm9k ZSB0eXBlcy4gSWYgdGhlIHRlc3QgaXMgc3VjY2Vzc2Z1bCwgdGhlcmUgc2hvdWxkIGJlIGZvdXIg bGluZXMgb2Ygb3V0cHV0LiBUaGUgZmlyc3QgbGluZSBzaG91bGQgYmUgdGhlIGNoaWxkMSB0YWcu IFRoZSBzZWNvbmQgc2hvdWxkIGJlIHRoZSBjaGlsZDIgdGFnLiBUaGUgdGhpcmQgb25lIHNob3Vs ZCBiZSBhIGNvbW1lbnQsIHRoZSBmb3VydGggb25lIHNob3VsZCBiZSB0aGUgY29tcGxldGUgZG9j dW1lbnQgYW5kIHRoZSBmaWZ0aCBvbmUgc2hvdWxkIGJlIHRoZSBjb21wbGV0ZSBkb2N1bWVudCBi dXQgc2VyaWFsaXplZCBmcm9tIGEgZG9jdW1lbnQgZnJhZ21lbnQgbm9kZS4KIDx1bCBpZD0iY29u c29sZSI+CiA8L3VsPgogPC9ib2R5PgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20vZG9tLXBh cnNlLXNlcmlhbGl6ZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290 L0xheW91dFRlc3RzL2Zhc3QvZG9tL2RvbS1wYXJzZS1zZXJpYWxpemUtZXhwZWN0ZWQudHh0LHYK cmV0cmlldmluZyByZXZpc2lvbiAxLjIKZGlmZiAtcCAtdSAtcjEuMiBMYXlvdXRUZXN0cy9mYXN0 L2RvbS9kb20tcGFyc2Utc2VyaWFsaXplLWV4cGVjdGVkLnR4dAotLS0gTGF5b3V0VGVzdHMvZmFz dC9kb20vZG9tLXBhcnNlLXNlcmlhbGl6ZS1leHBlY3RlZC50eHQJMTkgSnVsIDIwMDUgMTg6MzU6 NTIgLTAwMDAJMS4yCisrKyBMYXlvdXRUZXN0cy9mYXN0L2RvbS9kb20tcGFyc2Utc2VyaWFsaXpl LWV4cGVjdGVkLnR4dAkzMCBEZWMgMjAwNSAwOTo1MDo0NiAtMDAwMApAQCAtMjUsNyArMjUsNyBA QCBsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgw LDYwKSB3aWR0aCA0MDogIjxkb2M+IgogICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsNzUpIHdp ZHRoIDUzNjogIiAgPGZvbyB4bWxucz1cImZvb2JhclwiPk9uZTwvZm9vPiA8eDpiYXIgeG1sbnM6 eD1cImJhcmZvb1wiPlR3bzwveDpiYXI+IgogICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsOTAp IHdpZHRoIDE4NDogIiAgPGQgaWQ9XCJpZDNcIj5UaHJlZTwvZD4iCi0gICAgICAgICAgICB0ZXh0 IHJ1biBhdCAoMCwxMDUpIHdpZHRoIDQ4OiAiPC9kb2M+IgorICAgICAgICAgICAgdGV4dCBydW4g YXQgKDAsMTA1KSB3aWR0aCAzOTI6ICI8ZiBpZD1cIiZhbXA7Jmx0OyZndDtcIj5Gb3VyJmFtcDsm bHQ7Jmd0OzwvZj48L2RvYz4iCiAgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwyNjgpIHNp emUgNzg0eDYxIFtib3JkZXI6ICgxcHggc29saWQgIzAwMDAwMCldCiAgICAgICAgIFJlbmRlckJs b2NrIChhbm9ueW1vdXMpIGF0ICgxLDEpIHNpemUgNzgyeDE4CiAgICAgICAgICAgUmVuZGVySW5s aW5lIHtTUEFOfSBhdCAoMCwwKSBzaXplIDExMngxOCBbY29sb3I9IzgwMDAwMF0KQEAgLTQ2LDQg KzQ2LDQgQEAgbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCiAgICAgICAgICAgICB0ZXh0IHJ1 biBhdCAoMCwwKSB3aWR0aCA0MDogIjxkb2M+IgogICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAs MTUpIHdpZHRoIDUzNjogIiAgPGZvbyB4bWxucz1cImZvb2JhclwiPk9uZTwvZm9vPiA8eDpiYXIg eG1sbnM6eD1cImJhcmZvb1wiPlR3bzwveDpiYXI+IgogICAgICAgICAgICAgdGV4dCBydW4gYXQg KDAsMzApIHdpZHRoIDE4NDogIiAgPGQgaWQ9XCJpZDNcIj5UaHJlZTwvZD4iCi0gICAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCw0NSkgd2lkdGggNDg6ICI8L2RvYz4iCisgICAgICAgICAgICB0ZXh0 IHJ1biBhdCAoMCw0NSkgd2lkdGggMzkyOiAiPGYgaWQ9XCImYW1wOyZsdDsmZ3Q7XCI+Rm91ciZh bXA7Jmx0OyZndDs8L2Y+PC9kb2M+IgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20vZG9tLXBh cnNlLXNlcmlhbGl6ZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9MYXlvdXRU ZXN0cy9mYXN0L2RvbS9kb20tcGFyc2Utc2VyaWFsaXplLmh0bWwsdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuMQpkaWZmIC1wIC11IC1yMS4xIExheW91dFRlc3RzL2Zhc3QvZG9tL2RvbS1wYXJzZS1z ZXJpYWxpemUuaHRtbAotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vZG9tLXBhcnNlLXNlcmlhbGl6 ZS5odG1sCTggSnVuIDIwMDUgMDg6Mzk6MjAgLTAwMDAJMS4xCisrKyBMYXlvdXRUZXN0cy9mYXN0 L2RvbS9kb20tcGFyc2Utc2VyaWFsaXplLmh0bWwJMzAgRGVjIDIwMDUgMDk6NTA6NDYgLTAwMDAK QEAgLTQwLDcgKzQwLDcgQEAgZnVuY3Rpb24gZXhlY3V0ZSgpCiB7CiAgIHZhciBwYXJzZXIgPSBu ZXcgRE9NUGFyc2VyKCk7CiAgIHZhciBzdHIgPSAKLSAgICAnPD94bWwgdmVyc2lvbj0iMS4wIj8+ XG48IURPQ1RZUEUgZG9jIFtcbjwhQVRUTElTVCBkIGlkIElEICNJTVBMSUVEPlxuXT5cbjxkb2M+ XG4gIDxmb28geG1sbnM9ImZvb2JhciI+T25lPC9mb28+IDx4OmJhciB4bWxuczp4PSJiYXJmb28i PlR3bzwveDpiYXI+XG4gIDxkIGlkPSJpZDMiPlRocmVlPC9kPlxuPC9kb2M+XG4nOworICAgICc8 P3htbCB2ZXJzaW9uPSIxLjAiPz5cbjwhRE9DVFlQRSBkb2MgW1xuPCFBVFRMSVNUIGQgaWQgSUQg I0lNUExJRUQ+XG5dPlxuPGRvYz5cbiAgPGZvbyB4bWxucz0iZm9vYmFyIj5PbmU8L2Zvbz4gPHg6 YmFyIHhtbG5zOng9ImJhcmZvbyI+VHdvPC94OmJhcj5cbiAgPGQgaWQ9ImlkMyI+VGhyZWU8L2Q+ XG48ZiBpZD0iJmFtcDsmbHQ7Jmd0OyI+Rm91ciZhbXA7Jmx0OyZndDs8L2Y+PC9kb2M+XG4nOwog ICB2YXIgZG9jID0gcGFyc2VyLnBhcnNlRnJvbVN0cmluZyhzdHIsInRleHQveG1sIik7CiAgIAog ICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaWQxIikuZmlyc3RDaGlsZC5ub2RlVmFsdWUgPSBz dHI7CkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvV2ViQ29yZS9DaGFuZ2VMb2csdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNjQKZGlmZiAtcCAt dSAtcjEuNjQgV2ViQ29yZS9DaGFuZ2VMb2cKLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCTMwIERlYyAy MDA1IDA2OjQ2OjU1IC0wMDAwCTEuNjQKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCTMwIERlYyAyMDA1 IDA5OjUyOjU5IC0wMDAwCkBAIC0xLDMgKzEsMTggQEAKKzIwMDUtMTItMzAgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQG1hYy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKwkJLSBGaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVn LmNnaT9pZD02Mjk3CisJCVhNTFNlcmlhbGl6ZXIgc2hvdWxkIHVzZSBjcmVhdGVNYXJrdXAuCisJ CQkJCisgICAgICAgICoga2h0bWwvZWNtYS94bWxzZXJpYWxpemVyLmNwcDoKKyAgICAgICAgKEtK Uzo6WE1MU2VyaWFsaXplclByb3RvRnVuYzo6Y2FsbEFzRnVuY3Rpb24pOgorCQlVc2UgY3JlYXRl TWFya3VwIGluc3RlYWQgb2YgTm9kZUltcGw6OnRvU3RyaW5nLgorCQkKKyAgICAgICAgKiBraHRt bC9lZGl0aW5nL21hcmt1cC5jcHA6CisgICAgICAgIChraHRtbDo6c3RhcnRNYXJrdXApOgorCQll c2NhcGUgYXR0cmlidXRlIHZhbHVlcyBhbmQgaWdub3JlIGRvY3VtZW50IGZyYWdtZW50IG5vZGVz LgorCiAyMDA1LTEyLTI5ICBHcmFoYW0gRGVubmlzICA8R3JhaGFtLkRlbm5pc0BnbWFpbC5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSHlhdHQuCkluZGV4OiBXZWJDb3JlL2todG1sL2VjbWEv eG1sc2VyaWFsaXplci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUv a2h0bWwvZWNtYS94bWxzZXJpYWxpemVyLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMgpk aWZmIC1wIC11IC1yMS4xMiBXZWJDb3JlL2todG1sL2VjbWEveG1sc2VyaWFsaXplci5jcHAKLS0t IFdlYkNvcmUva2h0bWwvZWNtYS94bWxzZXJpYWxpemVyLmNwcAkyMiBEZWMgMjAwNSAyMToxMDo1 NCAtMDAwMAkxLjEyCisrKyBXZWJDb3JlL2todG1sL2VjbWEveG1sc2VyaWFsaXplci5jcHAJMzAg RGVjIDIwMDUgMDk6NTM6MDQgLTAwMDAKQEAgLTI3LDYgKzI3LDggQEAKICNpbmNsdWRlICJkb20v ZG9tX2V4Y2VwdGlvbi5oIgogI2luY2x1ZGUgInhtbC9kb21fZG9jaW1wbC5oIgogCisjaW5jbHVk ZSAibWFya3VwLmgiCisKICNpbmNsdWRlIDxrZGVidWcuaD4KIAogdXNpbmcgRE9NOjpOb2RlSW1w bDsKQEAgLTg4LDcgKzkwLDcgQEAgSlNWYWx1ZSAqWE1MU2VyaWFsaXplclByb3RvRnVuYzo6Y2Fs bEFzRgogICAgICAgfQogCiAgICAgICBOb2RlSW1wbCAqbm9kZSA9IHN0YXRpY19jYXN0PE5vZGVJ bXBsICo+KHN0YXRpY19jYXN0PERPTU5vZGUgKj4oYXJnc1swXS0+dG9PYmplY3QoZXhlYykpLT5p bXBsKCkpOwotICAgICAgcmV0dXJuIGpzU3RyaW5nT3JOdWxsKG5vZGUtPnRvU3RyaW5nKCkpOwor ICAgICAgcmV0dXJuIGpzU3RyaW5nT3JOdWxsKGNyZWF0ZU1hcmt1cChub2RlKSk7CiAgICAgfQog ICB9CiAKSW5kZXg6IFdlYkNvcmUva2h0bWwvZWRpdGluZy9tYXJrdXAuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K UkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL2VkaXRpbmcvbWFya3VwLmNwcCx2CnJl dHJpZXZpbmcgcmV2aXNpb24gMS40NApkaWZmIC1wIC11IC1yMS40NCBXZWJDb3JlL2todG1sL2Vk aXRpbmcvbWFya3VwLmNwcAotLS0gV2ViQ29yZS9raHRtbC9lZGl0aW5nL21hcmt1cC5jcHAJMjMg RGVjIDIwMDUgMTg6NDQ6MTQgLTAwMDAJMS40NAorKysgV2ViQ29yZS9raHRtbC9lZGl0aW5nL21h cmt1cC5jcHAJMzAgRGVjIDIwMDUgMDk6NTM6MDQgLTAwMDAKQEAgLTE5Nyw2ICsxOTcsNyBAQCBz dGF0aWMgUVN0cmluZyBzdGFydE1hcmt1cChjb25zdCBOb2RlSW1wCiAgICAgICAgIGNhc2UgTm9k ZTo6Q09NTUVOVF9OT0RFOgogICAgICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGNvbnN0IENv bW1lbnRJbXBsICo+KG5vZGUpLT50b1N0cmluZygpLnFzdHJpbmcoKTsKICAgICAgICAgY2FzZSBO b2RlOjpET0NVTUVOVF9OT0RFOgorICAgICAgICBjYXNlIE5vZGU6OkRPQ1VNRU5UX0ZSQUdNRU5U X05PREU6CiAgICAgICAgICAgICByZXR1cm4gIiI7CiAgICAgICAgIGNhc2UgTm9kZTo6UFJPQ0VT U0lOR19JTlNUUlVDVElPTl9OT0RFOgogICAgICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGNv bnN0IFByb2Nlc3NpbmdJbnN0cnVjdGlvbkltcGwgKj4obm9kZSktPnRvU3RyaW5nKCkucXN0cmlu ZygpOwpAQCAtMjMzLDcgKzIzNCw3IEBAIHN0YXRpYyBRU3RyaW5nIHN0YXJ0TWFya3VwKGNvbnN0 IE5vZGVJbXAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJrdXAgKz0gIiAiICsgYXR0 ci0+bmFtZSgpLmxvY2FsTmFtZSgpLnFzdHJpbmcoKTsKICAgICAgICAgICAgICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJrdXAgKz0gIiAiICsgYXR0ci0+ bmFtZSgpLnRvU3RyaW5nKCkucXN0cmluZygpOwotICAgICAgICAgICAgICAgICAgICAgICAgbWFy a3VwICs9ICI9XCIiICsgdmFsdWUucXN0cmluZygpICsgIlwiIjsKKyAgICAgICAgICAgICAgICAg ICAgICAgIG1hcmt1cCArPSAiPVwiIiArIGVzY2FwZUhUTUwodmFsdWUucXN0cmluZygpKSArICJc IiI7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB9Cg==