96385 2012-09-11 07:05:26 -0700 HTML parser fails to propertly close 4 identical nested formatting elements 2012-09-12 17:34:48 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://www.thezorklibrary.com/history/00-encyclopedia.html P2 Normal --- 1 zcorpan eric abarth ian james mike webkit.review.bot oldest_to_newest 717125 0 zcorpan 2012-09-11 07:05:26 -0700 URL has markup like this: <big><big><big><big>a</big></big></big></big>b See http://software.hixie.ch/utilities/js/live-dom-viewer/saved/1757 In Firefox the "b" is a child of body, in Opera/WebKit it's a child of the first <big> element (so the text gets bigger and bigger for each section on the page). In Opera we concluded that this was a spec violation and we have fixed it. 717245 1 abarth 2012-09-11 09:12:45 -0700 Isn't this just the noah's ark condition in action? 717286 2 ian 2012-09-11 09:46:16 -0700 I think a misimplementation of Noah is the cause here. When you see the fourth <big>, you add it to the stack but not the list, and when you see the first </big> you end up popping both of the last two <big>s. The third and fourth </big>s get rid of the last two, and the last </big> ends up ignored. No? Maybe we should increase the count to four per family... 717365 3 abarth 2012-09-11 10:43:29 -0700 Oh, did we goof up implementing the Noah's ark condition? If so, we're happy to fix it. 717953 4 zcorpan 2012-09-11 23:25:04 -0700 In Opera's case, we had missed to implement this part of AAA: "If there is no such node, then abort these steps and instead act as described in the "any other end tag" entry below." Hixie's comment doesn't quite match my understanding of the spec, but then again I don't quite follow AAA. My understanding is that when seeing the fourth <big>, it gets added to the stack and the list but the oldest <big> gets dropped off the list (which I guess is equivalent to not adding the new one to the list). The first three </big>s run the AAA as normal, and the fourth hits the clause quoted above and gets treated as "any other end tag". Since this page doesn't cause any elements to be reconstructed, what the limit is isn't supposed to make any difference here. 717986 5 ian 2012-09-12 00:22:47 -0700 Uh, right, zcorpan is right. I forgot the order in which Noah lopped things off the list. Ignore comment 2. 718310 6 zcorpan 2012-09-12 06:53:30 -0700 I added a few tests for the various limits to html5lib: https://code.google.com/p/html5lib/source/detail?r=5e044c0cfc8334f866d7a00b2cf90a935bd9a906 718648 7 abarth 2012-09-12 13:11:55 -0700 I think Eric is going to take a look at this bug. 718732 8 163694 eric 2012-09-12 14:38:01 -0700 Created attachment 163694 Patch 718733 9 eric 2012-09-12 14:38:26 -0700 This only fixes one of our two AA bugs. I'm looking at the second one now. 718741 10 163697 eric 2012-09-12 14:40:18 -0700 Created attachment 163697 Patch 718762 11 163697 abarth 2012-09-12 14:54:22 -0700 Comment on attachment 163697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163697&action=review > Source/WebCore/html/parser/HTMLTreeBuilder.cpp:1429 > + processAnyOtherEndTagForInBody(token); Bad indent 718764 12 163705 eric 2012-09-12 14:57:52 -0700 Created attachment 163705 Patch for landing 718817 13 163705 webkit.review.bot 2012-09-12 15:39:53 -0700 Comment on attachment 163705 Patch for landing Clearing flags on attachment: 163705 Committed r128373: <http://trac.webkit.org/changeset/128373> 718818 14 webkit.review.bot 2012-09-12 15:39:57 -0700 All reviewed patches have been landed. Closing bug. 718920 15 eric 2012-09-12 17:34:48 -0700 *** Bug 91509 has been marked as a duplicate of this bug. *** 163694 2012-09-12 14:38:01 -0700 2012-09-12 14:40:16 -0700 Patch bug-96385-20120912143735.patch text/plain 7510 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJjZWJjMzEzMDczMDVi ZTkzOGIxNDMwYmMwNjI2OThlZDA4NmU0Ni4uNDM5MTQwZjcwNjU5ZjJlMDg3NjkyZjViZDcwM2M2 OTcxYzY5MTM0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBIVE1MIHBhcnNlciBmYWlscyB0 byBwcm9wZXJ0bHkgY2xvc2UgNCBpZGVudGljYWwgbmVzdGVkIGZvcm1hdHRpbmcgZWxlbWVudHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2Mzg1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1pc3Np bmcgQWRvcHRpb24gYWdlbmN5IHN0ZXAgNC5hIHRvIGZpeCBvbmUgb2Ygb3VyIHR3byBvdXRseWlu ZyBBZG9wdGlvbiBBZ2VuY3kgYnVncy4KKyAgICAgICAgVGhpcyBpcyB0aGUgc2FtZSBzdGVwIHRo YXQgT3BlcmEgd2FzIG1pc3NpbmcgKG11c3QgaGF2ZSBiZWVuIHJlY2VudGx5IGFkZGVkIHRvIHRo ZSBzcGVjKS4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OmNhbGxUaGVBZG9wdGlvbkFnZW5jeSk6 CisKIDIwMTItMDktMTIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAogICAgICAgICBbRUZMXSBDb21waWxhdGlvbiBlcnJvciBpbiBSZW5kZXJUaGVtZUVm bC5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3Bw CmluZGV4IDUyMmE0NDA5YmY4NWQwYjA3ZjU2MTFmZWZlMTFmNTdkOTBmYWNkZmIuLmQ2YzdmOGQ0 ZTA4MTc3Y2NkYWMzNmMyY2Y5ZDFkY2ExZmJjOTQ5ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcApAQCAtMTQyMCw3NCArMTQyMCw4MSBAQCB2 b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tl biogdG9rZW4pCiAgICAgc3RhdGljIGNvbnN0IGludCBvdXRlckl0ZXJhdGlvbkxpbWl0ID0gODsK ICAgICBzdGF0aWMgY29uc3QgaW50IGlubmVySXRlcmF0aW9uTGltaXQgPSAzOwogCisgICAgLy8g MSwgMiwgMyBhbmQgMTYgYXJlIGNvdmVyZWQgYnkgdGhlIGZvcigpIGxvb3AuCiAgICAgZm9yIChp bnQgaSA9IDA7IGkgPCBvdXRlckl0ZXJhdGlvbkxpbWl0OyArK2kpIHsKLSAgICAgICAgLy8gMS4K KyAgICAgICAgLy8gNC4KICAgICAgICAgRWxlbWVudCogZm9ybWF0dGluZ0VsZW1lbnQgPSBtX3Ry ZWUuYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPmNsb3Nlc3RFbGVtZW50SW5TY29wZVdpdGhO YW1lKHRva2VuLT5uYW1lKCkpOwotICAgICAgICBpZiAoIWZvcm1hdHRpbmdFbGVtZW50IHx8ICgo bV90cmVlLm9wZW5FbGVtZW50cygpLT5jb250YWlucyhmb3JtYXR0aW5nRWxlbWVudCkpICYmICFt X3RyZWUub3BlbkVsZW1lbnRzKCktPmluU2NvcGUoZm9ybWF0dGluZ0VsZW1lbnQpKSkgeworICAg ICAgICAvLyA0LmEKKyAgICAgICAgaWYgKCFmb3JtYXR0aW5nRWxlbWVudCkKKyAgICAgICAgICAg ICAgICBwcm9jZXNzQW55T3RoZXJFbmRUYWdGb3JJbkJvZHkodG9rZW4pOworICAgICAgICAvLyA0 LmMKKyAgICAgICAgaWYgKChtX3RyZWUub3BlbkVsZW1lbnRzKCktPmNvbnRhaW5zKGZvcm1hdHRp bmdFbGVtZW50KSkgJiYgIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5TY29wZShmb3JtYXR0aW5n RWxlbWVudCkpIHsKICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICAgICAg bm90SW1wbGVtZW50ZWQoKTsgLy8gQ2hlY2sgdGhlIHN0YWNrIG9mIG9wZW4gZWxlbWVudHMgZm9y IGEgbW9yZSBzcGVjaWZpYyBwYXJzZSBlcnJvci4KICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQorICAgICAgICAvLyA0LmIKICAgICAgICAgSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJl Y29yZCogZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQgPSBtX3RyZWUub3BlbkVsZW1lbnRzKCktPmZp bmQoZm9ybWF0dGluZ0VsZW1lbnQpOwogICAgICAgICBpZiAoIWZvcm1hdHRpbmdFbGVtZW50UmVj b3JkKSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgICAgIG1fdHJl ZS5hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKS0+cmVtb3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQorICAgICAgICAvLyA0LmQKICAgICAgICAg aWYgKGZvcm1hdHRpbmdFbGVtZW50ICE9IG1fdHJlZS5jdXJyZW50RWxlbWVudCgpKQogICAgICAg ICAgICAgcGFyc2VFcnJvcih0b2tlbik7Ci0gICAgICAgIC8vIDIuCisgICAgICAgIC8vIDUuCiAg ICAgICAgIEhUTUxFbGVtZW50U3RhY2s6OkVsZW1lbnRSZWNvcmQqIGZ1cnRoZXN0QmxvY2sgPSBt X3RyZWUub3BlbkVsZW1lbnRzKCktPmZ1cnRoZXN0QmxvY2tGb3JGb3JtYXR0aW5nRWxlbWVudChm b3JtYXR0aW5nRWxlbWVudCk7Ci0gICAgICAgIC8vIDMuCisgICAgICAgIC8vIDYuCiAgICAgICAg IGlmICghZnVydGhlc3RCbG9jaykgewogICAgICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygp LT5wb3BVbnRpbFBvcHBlZChmb3JtYXR0aW5nRWxlbWVudCk7CiAgICAgICAgICAgICBtX3RyZWUu YWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPnJlbW92ZShmb3JtYXR0aW5nRWxlbWVudCk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgLy8gNC4KKyAgICAgICAgLy8g Ny4KICAgICAgICAgQVNTRVJUKGZ1cnRoZXN0QmxvY2stPmlzQWJvdmUoZm9ybWF0dGluZ0VsZW1l bnRSZWNvcmQpKTsKICAgICAgICAgUmVmUHRyPEhUTUxTdGFja0l0ZW0+IGNvbW1vbkFuY2VzdG9y ID0gZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQtPm5leHQoKS0+c3RhY2tJdGVtKCk7Ci0gICAgICAg IC8vIDUuCisgICAgICAgIC8vIDguCiAgICAgICAgIEhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6 OkJvb2ttYXJrIGJvb2ttYXJrID0gbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpLT5i b29rbWFya0Zvcihmb3JtYXR0aW5nRWxlbWVudCk7Ci0gICAgICAgIC8vIDYuCisgICAgICAgIC8v IDkuCiAgICAgICAgIEhUTUxFbGVtZW50U3RhY2s6OkVsZW1lbnRSZWNvcmQqIG5vZGUgPSBmdXJ0 aGVzdEJsb2NrOwogICAgICAgICBIVE1MRWxlbWVudFN0YWNrOjpFbGVtZW50UmVjb3JkKiBuZXh0 Tm9kZSA9IG5vZGUtPm5leHQoKTsKICAgICAgICAgSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJl Y29yZCogbGFzdE5vZGUgPSBmdXJ0aGVzdEJsb2NrOworICAgICAgICAvLyA5LjEsIDkuMiwgOS4z IGFuZCA5LjExIGFyZSBjb3ZlcmVkIGJ5IHRoZSBmb3IoKSBsb29wLgogICAgICAgICBmb3IgKGlu dCBpID0gMDsgaSA8IGlubmVySXRlcmF0aW9uTGltaXQ7ICsraSkgewotICAgICAgICAgICAgLy8g Ni4xCisgICAgICAgICAgICAvLyA5LjQKICAgICAgICAgICAgIG5vZGUgPSBuZXh0Tm9kZTsKICAg ICAgICAgICAgIEFTU0VSVChub2RlKTsKLSAgICAgICAgICAgIG5leHROb2RlID0gbm9kZS0+bmV4 dCgpOyAvLyBTYXZlIG5vZGUtPm5leHQoKSBmb3IgdGhlIG5leHQgaXRlcmF0aW9uIGluIGNhc2Ug bm9kZSBpcyBkZWxldGVkIGluIDYuMi4KLSAgICAgICAgICAgIC8vIDYuMgorICAgICAgICAgICAg bmV4dE5vZGUgPSBub2RlLT5uZXh0KCk7IC8vIFNhdmUgbm9kZS0+bmV4dCgpIGZvciB0aGUgbmV4 dCBpdGVyYXRpb24gaW4gY2FzZSBub2RlIGlzIGRlbGV0ZWQgaW4gOS41LgorICAgICAgICAgICAg Ly8gOS41CiAgICAgICAgICAgICBpZiAoIW1fdHJlZS5hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMo KS0+Y29udGFpbnMobm9kZS0+ZWxlbWVudCgpKSkgewogICAgICAgICAgICAgICAgIG1fdHJlZS5v cGVuRWxlbWVudHMoKS0+cmVtb3ZlKG5vZGUtPmVsZW1lbnQoKSk7CiAgICAgICAgICAgICAgICAg bm9kZSA9IDA7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAvLyA2LjMKKyAgICAgICAgICAgIC8vIDkuNgogICAgICAgICAgICAgaWYgKG5vZGUg PT0gZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAvLyA2LjUKKyAgICAgICAgICAgIC8vIDkuNwogICAgICAgICAgICAgUmVmUHRyPEhU TUxTdGFja0l0ZW0+IG5ld0l0ZW0gPSBtX3RyZWUuY3JlYXRlRWxlbWVudEZyb21TYXZlZFRva2Vu KG5vZGUtPnN0YWNrSXRlbSgpLmdldCgpKTsKIAogICAgICAgICAgICAgSFRNTEZvcm1hdHRpbmdF bGVtZW50TGlzdDo6RW50cnkqIG5vZGVFbnRyeSA9IG1fdHJlZS5hY3RpdmVGb3JtYXR0aW5nRWxl bWVudHMoKS0+ZmluZChub2RlLT5lbGVtZW50KCkpOwogICAgICAgICAgICAgbm9kZUVudHJ5LT5y ZXBsYWNlRWxlbWVudChuZXdJdGVtKTsKICAgICAgICAgICAgIG5vZGUtPnJlcGxhY2VFbGVtZW50 KG5ld0l0ZW0ucmVsZWFzZSgpKTsKLSAgICAgICAgICAgIC8vIDYuNCAtLSBJbnRlbnRpb25hbGx5 IG91dCBvZiBvcmRlciB0byBoYW5kbGUgdGhlIGNhc2Ugd2hlcmUgbm9kZQotICAgICAgICAgICAg Ly8gd2FzIHJlcGxhY2VkIGluIDYuNS4KLSAgICAgICAgICAgIC8vIGh0dHA6Ly93d3cudzMub3Jn L0J1Z3MvUHVibGljL3Nob3dfYnVnLmNnaT9pZD0xMDA5NgorCisgICAgICAgICAgICAvLyA5LjgK ICAgICAgICAgICAgIGlmIChsYXN0Tm9kZSA9PSBmdXJ0aGVzdEJsb2NrKQogICAgICAgICAgICAg ICAgIGJvb2ttYXJrLm1vdmVUb0FmdGVyKG5vZGVFbnRyeSk7Ci0gICAgICAgICAgICAvLyA2LjYK KyAgICAgICAgICAgIC8vIDkuOQogICAgICAgICAgICAgaWYgKENvbnRhaW5lck5vZGUqIHBhcmVu dCA9IGxhc3ROb2RlLT5lbGVtZW50KCktPnBhcmVudE5vZGUoKSkKICAgICAgICAgICAgICAgICBw YXJlbnQtPnBhcnNlclJlbW92ZUNoaWxkKGxhc3ROb2RlLT5lbGVtZW50KCkpOwogICAgICAgICAg ICAgbm9kZS0+ZWxlbWVudCgpLT5wYXJzZXJBZGRDaGlsZChsYXN0Tm9kZS0+ZWxlbWVudCgpKTsK ICAgICAgICAgICAgIGlmIChsYXN0Tm9kZS0+ZWxlbWVudCgpLT5wYXJlbnRFbGVtZW50KCktPmF0 dGFjaGVkKCkgJiYgIWxhc3ROb2RlLT5lbGVtZW50KCktPmF0dGFjaGVkKCkpCiAgICAgICAgICAg ICAgICAgbGFzdE5vZGUtPmVsZW1lbnQoKS0+bGF6eUF0dGFjaCgpOwotICAgICAgICAgICAgLy8g Ni43CisgICAgICAgICAgICAvLyA5LjEwCiAgICAgICAgICAgICBsYXN0Tm9kZSA9IG5vZGU7CiAg ICAgICAgIH0KLSAgICAgICAgLy8gNworICAgICAgICAvLyAxMC4KICAgICAgICAgaWYgKENvbnRh aW5lck5vZGUqIHBhcmVudCA9IGxhc3ROb2RlLT5lbGVtZW50KCktPnBhcmVudE5vZGUoKSkKICAg ICAgICAgICAgIHBhcmVudC0+cGFyc2VyUmVtb3ZlQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7 CiAgICAgICAgIGlmIChjb21tb25BbmNlc3Rvci0+Y2F1c2VzRm9zdGVyUGFyZW50aW5nKCkpCkBA IC0xNDk5LDI0ICsxNTA2LDI1IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhlQWRvcHRp b25BZ2VuY3koQXRvbWljSFRNTFRva2VuKiB0b2tlbikKICAgICAgICAgICAgIGlmIChsYXN0Tm9k ZS0+ZWxlbWVudCgpLT5wYXJlbnROb2RlKCktPmF0dGFjaGVkKCkgJiYgIWxhc3ROb2RlLT5lbGVt ZW50KCktPmF0dGFjaGVkKCkpCiAgICAgICAgICAgICAgICAgbGFzdE5vZGUtPmVsZW1lbnQoKS0+ bGF6eUF0dGFjaCgpOwogICAgICAgICB9Ci0gICAgICAgIC8vIDgKKyAgICAgICAgLy8gMTEuCiAg ICAgICAgIFJlZlB0cjxIVE1MU3RhY2tJdGVtPiBuZXdJdGVtID0gbV90cmVlLmNyZWF0ZUVsZW1l bnRGcm9tU2F2ZWRUb2tlbihmb3JtYXR0aW5nRWxlbWVudFJlY29yZC0+c3RhY2tJdGVtKCkuZ2V0 KCkpOwotICAgICAgICAvLyA5CisgICAgICAgIC8vIDEyLgogICAgICAgICBuZXdJdGVtLT5lbGVt ZW50KCktPnRha2VBbGxDaGlsZHJlbkZyb20oZnVydGhlc3RCbG9jay0+ZWxlbWVudCgpKTsKLSAg ICAgICAgLy8gMTAKKyAgICAgICAgLy8gMTMuCiAgICAgICAgIEVsZW1lbnQqIGZ1cnRoZXN0Qmxv Y2tFbGVtZW50ID0gZnVydGhlc3RCbG9jay0+ZWxlbWVudCgpOwogICAgICAgICAvLyBGSVhNRTog QWxsIHRoaXMgY3JlYXRpb24gLyBwYXJzZXJBZGRDaGlsZCAvIGF0dGFjaCBidXNpbmVzcyBzaG91 bGQKLSAgICAgICAgLy8gICAgICAgIGJlIGluIEhUTUxDb25zdHJ1Y3Rpb25TaXRlLiAgTXkgZ3Vl c3MgaXMgdGhhdCBzdGVwcyA4LS0xMgorICAgICAgICAvLyAgICAgICAgYmUgaW4gSFRNTENvbnN0 cnVjdGlvblNpdGUuIE15IGd1ZXNzIGlzIHRoYXQgc3RlcHMgMTEtLTE1CiAgICAgICAgIC8vICAg ICAgICBzaG91bGQgYWxsIGJlIGluIHNvbWUgSFRNTENvbnN0cnVjdGlvblNpdGUgZnVuY3Rpb24u CiAgICAgICAgIGZ1cnRoZXN0QmxvY2tFbGVtZW50LT5wYXJzZXJBZGRDaGlsZChuZXdJdGVtLT5l bGVtZW50KCkpOworICAgICAgICAvLyBGSVhNRTogV2h5IGlzIHRoaXMgYXR0YWNoIGxvZ2ljIG5l Y2Vzc2FyeT8gU3R5bGUgcmVzb2x2ZSBzaG91bGQgYXR0YWNoIHVzIGlmIG5lZWRlZC4KICAgICAg ICAgaWYgKGZ1cnRoZXN0QmxvY2tFbGVtZW50LT5hdHRhY2hlZCgpICYmICFuZXdJdGVtLT5lbGVt ZW50KCktPmF0dGFjaGVkKCkpIHsKICAgICAgICAgICAgIC8vIE5vdGljZSB0aGF0IG5ld0l0ZW0t PmVsZW1lbnQoKSBtaWdodCBhbHJlYWR5IGJlIGF0dGFjaGVkIGlmLCBmb3IgZXhhbXBsZSwgb25l IG9mIHRoZSByZXBhcmVudGVkCiAgICAgICAgICAgICAvLyBjaGlsZHJlbiBpcyBhIHN0eWxlIGVs ZW1lbnQsIHdoaWNoIGF0dGFjaGVzIGl0c2VsZiBhdXRvbWF0aWNhbGx5LgogICAgICAgICAgICAg bmV3SXRlbS0+ZWxlbWVudCgpLT5hdHRhY2goKTsKICAgICAgICAgfQotICAgICAgICAvLyAxMQor ICAgICAgICAvLyAxNC4KICAgICAgICAgbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygp LT5zd2FwVG8oZm9ybWF0dGluZ0VsZW1lbnQsIG5ld0l0ZW0sIGJvb2ttYXJrKTsKLSAgICAgICAg Ly8gMTIKKyAgICAgICAgLy8gMTUuCiAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cmVt b3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsKICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5p bnNlcnRBYm92ZShuZXdJdGVtLCBmdXJ0aGVzdEJsb2NrKTsKICAgICB9Cg== 163697 2012-09-12 14:40:18 -0700 2012-09-12 14:57:45 -0700 Patch bug-96385-20120912213952.patch text/plain 8599 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJjZWJjMzEzMDczMDVi ZTkzOGIxNDMwYmMwNjI2OThlZDA4NmU0Ni4uNDM5MTQwZjcwNjU5ZjJlMDg3NjkyZjViZDcwM2M2 OTcxYzY5MTM0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBIVE1MIHBhcnNlciBmYWlscyB0 byBwcm9wZXJ0bHkgY2xvc2UgNCBpZGVudGljYWwgbmVzdGVkIGZvcm1hdHRpbmcgZWxlbWVudHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2Mzg1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1pc3Np bmcgQWRvcHRpb24gYWdlbmN5IHN0ZXAgNC5hIHRvIGZpeCBvbmUgb2Ygb3VyIHR3byBvdXRseWlu ZyBBZG9wdGlvbiBBZ2VuY3kgYnVncy4KKyAgICAgICAgVGhpcyBpcyB0aGUgc2FtZSBzdGVwIHRo YXQgT3BlcmEgd2FzIG1pc3NpbmcgKG11c3QgaGF2ZSBiZWVuIHJlY2VudGx5IGFkZGVkIHRvIHRo ZSBzcGVjKS4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OmNhbGxUaGVBZG9wdGlvbkFnZW5jeSk6 CisKIDIwMTItMDktMTIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAogICAgICAgICBbRUZMXSBDb21waWxhdGlvbiBlcnJvciBpbiBSZW5kZXJUaGVtZUVm bC5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3Bw CmluZGV4IDUyMmE0NDA5YmY4NWQwYjA3ZjU2MTFmZWZlMTFmNTdkOTBmYWNkZmIuLmQ2YzdmOGQ0 ZTA4MTc3Y2NkYWMzNmMyY2Y5ZDFkY2ExZmJjOTQ5ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcApAQCAtMTQyMCw3NCArMTQyMCw4MSBAQCB2 b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tl biogdG9rZW4pCiAgICAgc3RhdGljIGNvbnN0IGludCBvdXRlckl0ZXJhdGlvbkxpbWl0ID0gODsK ICAgICBzdGF0aWMgY29uc3QgaW50IGlubmVySXRlcmF0aW9uTGltaXQgPSAzOwogCisgICAgLy8g MSwgMiwgMyBhbmQgMTYgYXJlIGNvdmVyZWQgYnkgdGhlIGZvcigpIGxvb3AuCiAgICAgZm9yIChp bnQgaSA9IDA7IGkgPCBvdXRlckl0ZXJhdGlvbkxpbWl0OyArK2kpIHsKLSAgICAgICAgLy8gMS4K KyAgICAgICAgLy8gNC4KICAgICAgICAgRWxlbWVudCogZm9ybWF0dGluZ0VsZW1lbnQgPSBtX3Ry ZWUuYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPmNsb3Nlc3RFbGVtZW50SW5TY29wZVdpdGhO YW1lKHRva2VuLT5uYW1lKCkpOwotICAgICAgICBpZiAoIWZvcm1hdHRpbmdFbGVtZW50IHx8ICgo bV90cmVlLm9wZW5FbGVtZW50cygpLT5jb250YWlucyhmb3JtYXR0aW5nRWxlbWVudCkpICYmICFt X3RyZWUub3BlbkVsZW1lbnRzKCktPmluU2NvcGUoZm9ybWF0dGluZ0VsZW1lbnQpKSkgeworICAg ICAgICAvLyA0LmEKKyAgICAgICAgaWYgKCFmb3JtYXR0aW5nRWxlbWVudCkKKyAgICAgICAgICAg ICAgICBwcm9jZXNzQW55T3RoZXJFbmRUYWdGb3JJbkJvZHkodG9rZW4pOworICAgICAgICAvLyA0 LmMKKyAgICAgICAgaWYgKChtX3RyZWUub3BlbkVsZW1lbnRzKCktPmNvbnRhaW5zKGZvcm1hdHRp bmdFbGVtZW50KSkgJiYgIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5TY29wZShmb3JtYXR0aW5n RWxlbWVudCkpIHsKICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICAgICAg bm90SW1wbGVtZW50ZWQoKTsgLy8gQ2hlY2sgdGhlIHN0YWNrIG9mIG9wZW4gZWxlbWVudHMgZm9y IGEgbW9yZSBzcGVjaWZpYyBwYXJzZSBlcnJvci4KICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQorICAgICAgICAvLyA0LmIKICAgICAgICAgSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJl Y29yZCogZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQgPSBtX3RyZWUub3BlbkVsZW1lbnRzKCktPmZp bmQoZm9ybWF0dGluZ0VsZW1lbnQpOwogICAgICAgICBpZiAoIWZvcm1hdHRpbmdFbGVtZW50UmVj b3JkKSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgICAgIG1fdHJl ZS5hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKS0+cmVtb3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQorICAgICAgICAvLyA0LmQKICAgICAgICAg aWYgKGZvcm1hdHRpbmdFbGVtZW50ICE9IG1fdHJlZS5jdXJyZW50RWxlbWVudCgpKQogICAgICAg ICAgICAgcGFyc2VFcnJvcih0b2tlbik7Ci0gICAgICAgIC8vIDIuCisgICAgICAgIC8vIDUuCiAg ICAgICAgIEhUTUxFbGVtZW50U3RhY2s6OkVsZW1lbnRSZWNvcmQqIGZ1cnRoZXN0QmxvY2sgPSBt X3RyZWUub3BlbkVsZW1lbnRzKCktPmZ1cnRoZXN0QmxvY2tGb3JGb3JtYXR0aW5nRWxlbWVudChm b3JtYXR0aW5nRWxlbWVudCk7Ci0gICAgICAgIC8vIDMuCisgICAgICAgIC8vIDYuCiAgICAgICAg IGlmICghZnVydGhlc3RCbG9jaykgewogICAgICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygp LT5wb3BVbnRpbFBvcHBlZChmb3JtYXR0aW5nRWxlbWVudCk7CiAgICAgICAgICAgICBtX3RyZWUu YWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPnJlbW92ZShmb3JtYXR0aW5nRWxlbWVudCk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgLy8gNC4KKyAgICAgICAgLy8g Ny4KICAgICAgICAgQVNTRVJUKGZ1cnRoZXN0QmxvY2stPmlzQWJvdmUoZm9ybWF0dGluZ0VsZW1l bnRSZWNvcmQpKTsKICAgICAgICAgUmVmUHRyPEhUTUxTdGFja0l0ZW0+IGNvbW1vbkFuY2VzdG9y ID0gZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQtPm5leHQoKS0+c3RhY2tJdGVtKCk7Ci0gICAgICAg IC8vIDUuCisgICAgICAgIC8vIDguCiAgICAgICAgIEhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6 OkJvb2ttYXJrIGJvb2ttYXJrID0gbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpLT5i b29rbWFya0Zvcihmb3JtYXR0aW5nRWxlbWVudCk7Ci0gICAgICAgIC8vIDYuCisgICAgICAgIC8v IDkuCiAgICAgICAgIEhUTUxFbGVtZW50U3RhY2s6OkVsZW1lbnRSZWNvcmQqIG5vZGUgPSBmdXJ0 aGVzdEJsb2NrOwogICAgICAgICBIVE1MRWxlbWVudFN0YWNrOjpFbGVtZW50UmVjb3JkKiBuZXh0 Tm9kZSA9IG5vZGUtPm5leHQoKTsKICAgICAgICAgSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJl Y29yZCogbGFzdE5vZGUgPSBmdXJ0aGVzdEJsb2NrOworICAgICAgICAvLyA5LjEsIDkuMiwgOS4z IGFuZCA5LjExIGFyZSBjb3ZlcmVkIGJ5IHRoZSBmb3IoKSBsb29wLgogICAgICAgICBmb3IgKGlu dCBpID0gMDsgaSA8IGlubmVySXRlcmF0aW9uTGltaXQ7ICsraSkgewotICAgICAgICAgICAgLy8g Ni4xCisgICAgICAgICAgICAvLyA5LjQKICAgICAgICAgICAgIG5vZGUgPSBuZXh0Tm9kZTsKICAg ICAgICAgICAgIEFTU0VSVChub2RlKTsKLSAgICAgICAgICAgIG5leHROb2RlID0gbm9kZS0+bmV4 dCgpOyAvLyBTYXZlIG5vZGUtPm5leHQoKSBmb3IgdGhlIG5leHQgaXRlcmF0aW9uIGluIGNhc2Ug bm9kZSBpcyBkZWxldGVkIGluIDYuMi4KLSAgICAgICAgICAgIC8vIDYuMgorICAgICAgICAgICAg bmV4dE5vZGUgPSBub2RlLT5uZXh0KCk7IC8vIFNhdmUgbm9kZS0+bmV4dCgpIGZvciB0aGUgbmV4 dCBpdGVyYXRpb24gaW4gY2FzZSBub2RlIGlzIGRlbGV0ZWQgaW4gOS41LgorICAgICAgICAgICAg Ly8gOS41CiAgICAgICAgICAgICBpZiAoIW1fdHJlZS5hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMo KS0+Y29udGFpbnMobm9kZS0+ZWxlbWVudCgpKSkgewogICAgICAgICAgICAgICAgIG1fdHJlZS5v cGVuRWxlbWVudHMoKS0+cmVtb3ZlKG5vZGUtPmVsZW1lbnQoKSk7CiAgICAgICAgICAgICAgICAg bm9kZSA9IDA7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAvLyA2LjMKKyAgICAgICAgICAgIC8vIDkuNgogICAgICAgICAgICAgaWYgKG5vZGUg PT0gZm9ybWF0dGluZ0VsZW1lbnRSZWNvcmQpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAvLyA2LjUKKyAgICAgICAgICAgIC8vIDkuNwogICAgICAgICAgICAgUmVmUHRyPEhU TUxTdGFja0l0ZW0+IG5ld0l0ZW0gPSBtX3RyZWUuY3JlYXRlRWxlbWVudEZyb21TYXZlZFRva2Vu KG5vZGUtPnN0YWNrSXRlbSgpLmdldCgpKTsKIAogICAgICAgICAgICAgSFRNTEZvcm1hdHRpbmdF bGVtZW50TGlzdDo6RW50cnkqIG5vZGVFbnRyeSA9IG1fdHJlZS5hY3RpdmVGb3JtYXR0aW5nRWxl bWVudHMoKS0+ZmluZChub2RlLT5lbGVtZW50KCkpOwogICAgICAgICAgICAgbm9kZUVudHJ5LT5y ZXBsYWNlRWxlbWVudChuZXdJdGVtKTsKICAgICAgICAgICAgIG5vZGUtPnJlcGxhY2VFbGVtZW50 KG5ld0l0ZW0ucmVsZWFzZSgpKTsKLSAgICAgICAgICAgIC8vIDYuNCAtLSBJbnRlbnRpb25hbGx5 IG91dCBvZiBvcmRlciB0byBoYW5kbGUgdGhlIGNhc2Ugd2hlcmUgbm9kZQotICAgICAgICAgICAg Ly8gd2FzIHJlcGxhY2VkIGluIDYuNS4KLSAgICAgICAgICAgIC8vIGh0dHA6Ly93d3cudzMub3Jn L0J1Z3MvUHVibGljL3Nob3dfYnVnLmNnaT9pZD0xMDA5NgorCisgICAgICAgICAgICAvLyA5LjgK ICAgICAgICAgICAgIGlmIChsYXN0Tm9kZSA9PSBmdXJ0aGVzdEJsb2NrKQogICAgICAgICAgICAg ICAgIGJvb2ttYXJrLm1vdmVUb0FmdGVyKG5vZGVFbnRyeSk7Ci0gICAgICAgICAgICAvLyA2LjYK KyAgICAgICAgICAgIC8vIDkuOQogICAgICAgICAgICAgaWYgKENvbnRhaW5lck5vZGUqIHBhcmVu dCA9IGxhc3ROb2RlLT5lbGVtZW50KCktPnBhcmVudE5vZGUoKSkKICAgICAgICAgICAgICAgICBw YXJlbnQtPnBhcnNlclJlbW92ZUNoaWxkKGxhc3ROb2RlLT5lbGVtZW50KCkpOwogICAgICAgICAg ICAgbm9kZS0+ZWxlbWVudCgpLT5wYXJzZXJBZGRDaGlsZChsYXN0Tm9kZS0+ZWxlbWVudCgpKTsK ICAgICAgICAgICAgIGlmIChsYXN0Tm9kZS0+ZWxlbWVudCgpLT5wYXJlbnRFbGVtZW50KCktPmF0 dGFjaGVkKCkgJiYgIWxhc3ROb2RlLT5lbGVtZW50KCktPmF0dGFjaGVkKCkpCiAgICAgICAgICAg ICAgICAgbGFzdE5vZGUtPmVsZW1lbnQoKS0+bGF6eUF0dGFjaCgpOwotICAgICAgICAgICAgLy8g Ni43CisgICAgICAgICAgICAvLyA5LjEwCiAgICAgICAgICAgICBsYXN0Tm9kZSA9IG5vZGU7CiAg ICAgICAgIH0KLSAgICAgICAgLy8gNworICAgICAgICAvLyAxMC4KICAgICAgICAgaWYgKENvbnRh aW5lck5vZGUqIHBhcmVudCA9IGxhc3ROb2RlLT5lbGVtZW50KCktPnBhcmVudE5vZGUoKSkKICAg ICAgICAgICAgIHBhcmVudC0+cGFyc2VyUmVtb3ZlQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7 CiAgICAgICAgIGlmIChjb21tb25BbmNlc3Rvci0+Y2F1c2VzRm9zdGVyUGFyZW50aW5nKCkpCkBA IC0xNDk5LDI0ICsxNTA2LDI1IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhlQWRvcHRp b25BZ2VuY3koQXRvbWljSFRNTFRva2VuKiB0b2tlbikKICAgICAgICAgICAgIGlmIChsYXN0Tm9k ZS0+ZWxlbWVudCgpLT5wYXJlbnROb2RlKCktPmF0dGFjaGVkKCkgJiYgIWxhc3ROb2RlLT5lbGVt ZW50KCktPmF0dGFjaGVkKCkpCiAgICAgICAgICAgICAgICAgbGFzdE5vZGUtPmVsZW1lbnQoKS0+ bGF6eUF0dGFjaCgpOwogICAgICAgICB9Ci0gICAgICAgIC8vIDgKKyAgICAgICAgLy8gMTEuCiAg ICAgICAgIFJlZlB0cjxIVE1MU3RhY2tJdGVtPiBuZXdJdGVtID0gbV90cmVlLmNyZWF0ZUVsZW1l bnRGcm9tU2F2ZWRUb2tlbihmb3JtYXR0aW5nRWxlbWVudFJlY29yZC0+c3RhY2tJdGVtKCkuZ2V0 KCkpOwotICAgICAgICAvLyA5CisgICAgICAgIC8vIDEyLgogICAgICAgICBuZXdJdGVtLT5lbGVt ZW50KCktPnRha2VBbGxDaGlsZHJlbkZyb20oZnVydGhlc3RCbG9jay0+ZWxlbWVudCgpKTsKLSAg ICAgICAgLy8gMTAKKyAgICAgICAgLy8gMTMuCiAgICAgICAgIEVsZW1lbnQqIGZ1cnRoZXN0Qmxv Y2tFbGVtZW50ID0gZnVydGhlc3RCbG9jay0+ZWxlbWVudCgpOwogICAgICAgICAvLyBGSVhNRTog QWxsIHRoaXMgY3JlYXRpb24gLyBwYXJzZXJBZGRDaGlsZCAvIGF0dGFjaCBidXNpbmVzcyBzaG91 bGQKLSAgICAgICAgLy8gICAgICAgIGJlIGluIEhUTUxDb25zdHJ1Y3Rpb25TaXRlLiAgTXkgZ3Vl c3MgaXMgdGhhdCBzdGVwcyA4LS0xMgorICAgICAgICAvLyAgICAgICAgYmUgaW4gSFRNTENvbnN0 cnVjdGlvblNpdGUuIE15IGd1ZXNzIGlzIHRoYXQgc3RlcHMgMTEtLTE1CiAgICAgICAgIC8vICAg ICAgICBzaG91bGQgYWxsIGJlIGluIHNvbWUgSFRNTENvbnN0cnVjdGlvblNpdGUgZnVuY3Rpb24u CiAgICAgICAgIGZ1cnRoZXN0QmxvY2tFbGVtZW50LT5wYXJzZXJBZGRDaGlsZChuZXdJdGVtLT5l bGVtZW50KCkpOworICAgICAgICAvLyBGSVhNRTogV2h5IGlzIHRoaXMgYXR0YWNoIGxvZ2ljIG5l Y2Vzc2FyeT8gU3R5bGUgcmVzb2x2ZSBzaG91bGQgYXR0YWNoIHVzIGlmIG5lZWRlZC4KICAgICAg ICAgaWYgKGZ1cnRoZXN0QmxvY2tFbGVtZW50LT5hdHRhY2hlZCgpICYmICFuZXdJdGVtLT5lbGVt ZW50KCktPmF0dGFjaGVkKCkpIHsKICAgICAgICAgICAgIC8vIE5vdGljZSB0aGF0IG5ld0l0ZW0t PmVsZW1lbnQoKSBtaWdodCBhbHJlYWR5IGJlIGF0dGFjaGVkIGlmLCBmb3IgZXhhbXBsZSwgb25l IG9mIHRoZSByZXBhcmVudGVkCiAgICAgICAgICAgICAvLyBjaGlsZHJlbiBpcyBhIHN0eWxlIGVs ZW1lbnQsIHdoaWNoIGF0dGFjaGVzIGl0c2VsZiBhdXRvbWF0aWNhbGx5LgogICAgICAgICAgICAg bmV3SXRlbS0+ZWxlbWVudCgpLT5hdHRhY2goKTsKICAgICAgICAgfQotICAgICAgICAvLyAxMQor ICAgICAgICAvLyAxNC4KICAgICAgICAgbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygp LT5zd2FwVG8oZm9ybWF0dGluZ0VsZW1lbnQsIG5ld0l0ZW0sIGJvb2ttYXJrKTsKLSAgICAgICAg Ly8gMTIKKyAgICAgICAgLy8gMTUuCiAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cmVt b3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsKICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5p bnNlcnRBYm92ZShuZXdJdGVtLCBmdXJ0aGVzdEJsb2NrKTsKICAgICB9CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHRt bDVsaWIvcnVubmVyLWV4cGVjdGVkLnR4dAppbmRleCAzZjY4ODAxZjVjOTI2NjliNmVhMzc3MWRi MWRjYmMzZWI3MmI3ZTA5Li4xYzYxMGQ2MDBiMjhiMmQzOTM4M2I3NjI1NjliN2U0NGUxYjVjOTBj IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC50eHQKQEAgLTksNyArOSw2 IEBAIENPTlNPTEUgTUVTU0FHRTogbGluZSAyOiBQQVNTCiBDT05TT0xFIE1FU1NBR0U6IGxpbmUg MjogRk9PPHNwYW4+QkFSPC9zcGFuPkJBWgogcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0OgogMTQK LTE2CiAKIFRlc3QgMTQgb2YgMTcgaW4gcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0IGZhaWxlZC4g SW5wdXQ6CiA8ZGl2PjxhPjxiPjxkaXY+PGRpdj48ZGl2PjxkaXY+PGRpdj48ZGl2PjxkaXY+PGRp dj48ZGl2PjxkaXY+PC9hPgpAQCAtNjUsMjkgKzY0LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgICAg ICAgICAgICAgICAgICAgIDxhPgogfCAgICAgICAgICAgICAgICAgICAgICAgICA8ZGl2PgogfCAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxkaXY+Ci0KLVRlc3QgMTYgb2YgMTcgaW4gcmVzb3Vy Y2VzL2Fkb3B0aW9uMDEuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08Yj48Yj48Yj48Yj54PC9iPjwvYj48 L2I+PC9iPnkKLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8 Yj4KLXwgICAgICAgPGI+Ci18ICAgICAgICAgPGI+Ci18ICAgICAgICAgICA8Yj4KLXwgICAgICAg ICAgICAgIngiCi18ICAgICAgICJ5IgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgot fCAgIDxib2R5PgotfCAgICAgPGI+Ci18ICAgICAgIDxiPgotfCAgICAgICAgIDxiPgotfCAgICAg ICAgICAgPGI+Ci18ICAgICAgICAgICAgICJ4IgotfCAgICAgInkiCiByZXNvdXJjZXMvYWRvcHRp b24wMi5kYXQ6IFBBU1MKIAogcmVzb3VyY2VzL2NvbW1lbnRzMDEuZGF0OiBQQVNTCg== 163705 2012-09-12 14:57:52 -0700 2012-09-12 15:39:53 -0700 Patch for landing bug-96385-20120912215725.patch text/plain 8598 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJjZWJjMzEzMDczMDVi ZTkzOGIxNDMwYmMwNjI2OThlZDA4NmU0Ni4uYmY0NTg0NzNiNDM5ODgyMGU2NGZiYTg2Mjc0MDA3 NTFhNWI3ODY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBIVE1MIHBhcnNlciBmYWlscyB0 byBwcm9wZXJ0bHkgY2xvc2UgNCBpZGVudGljYWwgbmVzdGVkIGZvcm1hdHRpbmcgZWxlbWVudHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2Mzg1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBBZGQgbWlzc2luZyBB ZG9wdGlvbiBhZ2VuY3kgc3RlcCA0LmEgdG8gZml4IG9uZSBvZiBvdXIgdHdvIG91dGx5aW5nIEFk b3B0aW9uIEFnZW5jeSBidWdzLgorICAgICAgICBUaGlzIGlzIHRoZSBzYW1lIHN0ZXAgdGhhdCBP cGVyYSB3YXMgbWlzc2luZyAobXVzdCBoYXZlIGJlZW4gcmVjZW50bHkgYWRkZWQgdG8gdGhlIHNw ZWMpLgorCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KToKKwog MjAxMi0wOS0xMiAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29t PgogCiAgICAgICAgIFtFRkxdIENvbXBpbGF0aW9uIGVycm9yIGluIFJlbmRlclRoZW1lRWZsLmNw cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKaW5k ZXggNTIyYTQ0MDliZjg1ZDBiMDdmNTYxMWZlZmUxMWY1N2Q5MGZhY2RmYi4uM2U5YjMwM2M2OTg4 YTBmNzAxMzlkMzE2Mjc4YzQ2ZGIwOTQ3YjdkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCkBAIC0xNDIwLDc0ICsxNDIwLDgxIEBAIHZvaWQg SFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRva2VuKiB0 b2tlbikKICAgICBzdGF0aWMgY29uc3QgaW50IG91dGVySXRlcmF0aW9uTGltaXQgPSA4OwogICAg IHN0YXRpYyBjb25zdCBpbnQgaW5uZXJJdGVyYXRpb25MaW1pdCA9IDM7CiAKKyAgICAvLyAxLCAy LCAzIGFuZCAxNiBhcmUgY292ZXJlZCBieSB0aGUgZm9yKCkgbG9vcC4KICAgICBmb3IgKGludCBp ID0gMDsgaSA8IG91dGVySXRlcmF0aW9uTGltaXQ7ICsraSkgewotICAgICAgICAvLyAxLgorICAg ICAgICAvLyA0LgogICAgICAgICBFbGVtZW50KiBmb3JtYXR0aW5nRWxlbWVudCA9IG1fdHJlZS5h Y3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKS0+Y2xvc2VzdEVsZW1lbnRJblNjb3BlV2l0aE5hbWUo dG9rZW4tPm5hbWUoKSk7Ci0gICAgICAgIGlmICghZm9ybWF0dGluZ0VsZW1lbnQgfHwgKChtX3Ry ZWUub3BlbkVsZW1lbnRzKCktPmNvbnRhaW5zKGZvcm1hdHRpbmdFbGVtZW50KSkgJiYgIW1fdHJl ZS5vcGVuRWxlbWVudHMoKS0+aW5TY29wZShmb3JtYXR0aW5nRWxlbWVudCkpKSB7CisgICAgICAg IC8vIDQuYQorICAgICAgICBpZiAoIWZvcm1hdHRpbmdFbGVtZW50KQorICAgICAgICAgICAgcmV0 dXJuIHByb2Nlc3NBbnlPdGhlckVuZFRhZ0ZvckluQm9keSh0b2tlbik7CisgICAgICAgIC8vIDQu YworICAgICAgICBpZiAoKG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+Y29udGFpbnMoZm9ybWF0dGlu Z0VsZW1lbnQpKSAmJiAhbV90cmVlLm9wZW5FbGVtZW50cygpLT5pblNjb3BlKGZvcm1hdHRpbmdF bGVtZW50KSkgewogICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CiAgICAgICAgICAgICBu b3RJbXBsZW1lbnRlZCgpOyAvLyBDaGVjayB0aGUgc3RhY2sgb2Ygb3BlbiBlbGVtZW50cyBmb3Ig YSBtb3JlIHNwZWNpZmljIHBhcnNlIGVycm9yLgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB9CisgICAgICAgIC8vIDQuYgogICAgICAgICBIVE1MRWxlbWVudFN0YWNrOjpFbGVtZW50UmVj b3JkKiBmb3JtYXR0aW5nRWxlbWVudFJlY29yZCA9IG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+Zmlu ZChmb3JtYXR0aW5nRWxlbWVudCk7CiAgICAgICAgIGlmICghZm9ybWF0dGluZ0VsZW1lbnRSZWNv cmQpIHsKICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICAgICAgbV90cmVl LmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpLT5yZW1vdmUoZm9ybWF0dGluZ0VsZW1lbnQpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CisgICAgICAgIC8vIDQuZAogICAgICAgICBp ZiAoZm9ybWF0dGluZ0VsZW1lbnQgIT0gbV90cmVlLmN1cnJlbnRFbGVtZW50KCkpCiAgICAgICAg ICAgICBwYXJzZUVycm9yKHRva2VuKTsKLSAgICAgICAgLy8gMi4KKyAgICAgICAgLy8gNS4KICAg ICAgICAgSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJlY29yZCogZnVydGhlc3RCbG9jayA9IG1f dHJlZS5vcGVuRWxlbWVudHMoKS0+ZnVydGhlc3RCbG9ja0ZvckZvcm1hdHRpbmdFbGVtZW50KGZv cm1hdHRpbmdFbGVtZW50KTsKLSAgICAgICAgLy8gMy4KKyAgICAgICAgLy8gNi4KICAgICAgICAg aWYgKCFmdXJ0aGVzdEJsb2NrKSB7CiAgICAgICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCkt PnBvcFVudGlsUG9wcGVkKGZvcm1hdHRpbmdFbGVtZW50KTsKICAgICAgICAgICAgIG1fdHJlZS5h Y3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKS0+cmVtb3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICAvLyA0LgorICAgICAgICAvLyA3 LgogICAgICAgICBBU1NFUlQoZnVydGhlc3RCbG9jay0+aXNBYm92ZShmb3JtYXR0aW5nRWxlbWVu dFJlY29yZCkpOwogICAgICAgICBSZWZQdHI8SFRNTFN0YWNrSXRlbT4gY29tbW9uQW5jZXN0b3Ig PSBmb3JtYXR0aW5nRWxlbWVudFJlY29yZC0+bmV4dCgpLT5zdGFja0l0ZW0oKTsKLSAgICAgICAg Ly8gNS4KKyAgICAgICAgLy8gOC4KICAgICAgICAgSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6 Qm9va21hcmsgYm9va21hcmsgPSBtX3RyZWUuYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPmJv b2ttYXJrRm9yKGZvcm1hdHRpbmdFbGVtZW50KTsKLSAgICAgICAgLy8gNi4KKyAgICAgICAgLy8g OS4KICAgICAgICAgSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJlY29yZCogbm9kZSA9IGZ1cnRo ZXN0QmxvY2s7CiAgICAgICAgIEhUTUxFbGVtZW50U3RhY2s6OkVsZW1lbnRSZWNvcmQqIG5leHRO b2RlID0gbm9kZS0+bmV4dCgpOwogICAgICAgICBIVE1MRWxlbWVudFN0YWNrOjpFbGVtZW50UmVj b3JkKiBsYXN0Tm9kZSA9IGZ1cnRoZXN0QmxvY2s7CisgICAgICAgIC8vIDkuMSwgOS4yLCA5LjMg YW5kIDkuMTEgYXJlIGNvdmVyZWQgYnkgdGhlIGZvcigpIGxvb3AuCiAgICAgICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgaW5uZXJJdGVyYXRpb25MaW1pdDsgKytpKSB7Ci0gICAgICAgICAgICAvLyA2 LjEKKyAgICAgICAgICAgIC8vIDkuNAogICAgICAgICAgICAgbm9kZSA9IG5leHROb2RlOwogICAg ICAgICAgICAgQVNTRVJUKG5vZGUpOwotICAgICAgICAgICAgbmV4dE5vZGUgPSBub2RlLT5uZXh0 KCk7IC8vIFNhdmUgbm9kZS0+bmV4dCgpIGZvciB0aGUgbmV4dCBpdGVyYXRpb24gaW4gY2FzZSBu b2RlIGlzIGRlbGV0ZWQgaW4gNi4yLgotICAgICAgICAgICAgLy8gNi4yCisgICAgICAgICAgICBu ZXh0Tm9kZSA9IG5vZGUtPm5leHQoKTsgLy8gU2F2ZSBub2RlLT5uZXh0KCkgZm9yIHRoZSBuZXh0 IGl0ZXJhdGlvbiBpbiBjYXNlIG5vZGUgaXMgZGVsZXRlZCBpbiA5LjUuCisgICAgICAgICAgICAv LyA5LjUKICAgICAgICAgICAgIGlmICghbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygp LT5jb250YWlucyhub2RlLT5lbGVtZW50KCkpKSB7CiAgICAgICAgICAgICAgICAgbV90cmVlLm9w ZW5FbGVtZW50cygpLT5yZW1vdmUobm9kZS0+ZWxlbWVudCgpKTsKICAgICAgICAgICAgICAgICBu b2RlID0gMDsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIC8vIDYuMworICAgICAgICAgICAgLy8gOS42CiAgICAgICAgICAgICBpZiAobm9kZSA9 PSBmb3JtYXR0aW5nRWxlbWVudFJlY29yZCkKICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIC8vIDYuNQorICAgICAgICAgICAgLy8gOS43CiAgICAgICAgICAgICBSZWZQdHI8SFRN TFN0YWNrSXRlbT4gbmV3SXRlbSA9IG1fdHJlZS5jcmVhdGVFbGVtZW50RnJvbVNhdmVkVG9rZW4o bm9kZS0+c3RhY2tJdGVtKCkuZ2V0KCkpOwogCiAgICAgICAgICAgICBIVE1MRm9ybWF0dGluZ0Vs ZW1lbnRMaXN0OjpFbnRyeSogbm9kZUVudHJ5ID0gbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVt ZW50cygpLT5maW5kKG5vZGUtPmVsZW1lbnQoKSk7CiAgICAgICAgICAgICBub2RlRW50cnktPnJl cGxhY2VFbGVtZW50KG5ld0l0ZW0pOwogICAgICAgICAgICAgbm9kZS0+cmVwbGFjZUVsZW1lbnQo bmV3SXRlbS5yZWxlYXNlKCkpOwotICAgICAgICAgICAgLy8gNi40IC0tIEludGVudGlvbmFsbHkg b3V0IG9mIG9yZGVyIHRvIGhhbmRsZSB0aGUgY2FzZSB3aGVyZSBub2RlCi0gICAgICAgICAgICAv LyB3YXMgcmVwbGFjZWQgaW4gNi41LgotICAgICAgICAgICAgLy8gaHR0cDovL3d3dy53My5vcmcv QnVncy9QdWJsaWMvc2hvd19idWcuY2dpP2lkPTEwMDk2CisKKyAgICAgICAgICAgIC8vIDkuOAog ICAgICAgICAgICAgaWYgKGxhc3ROb2RlID09IGZ1cnRoZXN0QmxvY2spCiAgICAgICAgICAgICAg ICAgYm9va21hcmsubW92ZVRvQWZ0ZXIobm9kZUVudHJ5KTsKLSAgICAgICAgICAgIC8vIDYuNgor ICAgICAgICAgICAgLy8gOS45CiAgICAgICAgICAgICBpZiAoQ29udGFpbmVyTm9kZSogcGFyZW50 ID0gbGFzdE5vZGUtPmVsZW1lbnQoKS0+cGFyZW50Tm9kZSgpKQogICAgICAgICAgICAgICAgIHBh cmVudC0+cGFyc2VyUmVtb3ZlQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CiAgICAgICAgICAg ICBub2RlLT5lbGVtZW50KCktPnBhcnNlckFkZENoaWxkKGxhc3ROb2RlLT5lbGVtZW50KCkpOwog ICAgICAgICAgICAgaWYgKGxhc3ROb2RlLT5lbGVtZW50KCktPnBhcmVudEVsZW1lbnQoKS0+YXR0 YWNoZWQoKSAmJiAhbGFzdE5vZGUtPmVsZW1lbnQoKS0+YXR0YWNoZWQoKSkKICAgICAgICAgICAg ICAgICBsYXN0Tm9kZS0+ZWxlbWVudCgpLT5sYXp5QXR0YWNoKCk7Ci0gICAgICAgICAgICAvLyA2 LjcKKyAgICAgICAgICAgIC8vIDkuMTAKICAgICAgICAgICAgIGxhc3ROb2RlID0gbm9kZTsKICAg ICAgICAgfQotICAgICAgICAvLyA3CisgICAgICAgIC8vIDEwLgogICAgICAgICBpZiAoQ29udGFp bmVyTm9kZSogcGFyZW50ID0gbGFzdE5vZGUtPmVsZW1lbnQoKS0+cGFyZW50Tm9kZSgpKQogICAg ICAgICAgICAgcGFyZW50LT5wYXJzZXJSZW1vdmVDaGlsZChsYXN0Tm9kZS0+ZWxlbWVudCgpKTsK ICAgICAgICAgaWYgKGNvbW1vbkFuY2VzdG9yLT5jYXVzZXNGb3N0ZXJQYXJlbnRpbmcoKSkKQEAg LTE0OTksMjQgKzE1MDYsMjUgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OmNhbGxUaGVBZG9wdGlv bkFnZW5jeShBdG9taWNIVE1MVG9rZW4qIHRva2VuKQogICAgICAgICAgICAgaWYgKGxhc3ROb2Rl LT5lbGVtZW50KCktPnBhcmVudE5vZGUoKS0+YXR0YWNoZWQoKSAmJiAhbGFzdE5vZGUtPmVsZW1l bnQoKS0+YXR0YWNoZWQoKSkKICAgICAgICAgICAgICAgICBsYXN0Tm9kZS0+ZWxlbWVudCgpLT5s YXp5QXR0YWNoKCk7CiAgICAgICAgIH0KLSAgICAgICAgLy8gOAorICAgICAgICAvLyAxMS4KICAg ICAgICAgUmVmUHRyPEhUTUxTdGFja0l0ZW0+IG5ld0l0ZW0gPSBtX3RyZWUuY3JlYXRlRWxlbWVu dEZyb21TYXZlZFRva2VuKGZvcm1hdHRpbmdFbGVtZW50UmVjb3JkLT5zdGFja0l0ZW0oKS5nZXQo KSk7Ci0gICAgICAgIC8vIDkKKyAgICAgICAgLy8gMTIuCiAgICAgICAgIG5ld0l0ZW0tPmVsZW1l bnQoKS0+dGFrZUFsbENoaWxkcmVuRnJvbShmdXJ0aGVzdEJsb2NrLT5lbGVtZW50KCkpOwotICAg ICAgICAvLyAxMAorICAgICAgICAvLyAxMy4KICAgICAgICAgRWxlbWVudCogZnVydGhlc3RCbG9j a0VsZW1lbnQgPSBmdXJ0aGVzdEJsb2NrLT5lbGVtZW50KCk7CiAgICAgICAgIC8vIEZJWE1FOiBB bGwgdGhpcyBjcmVhdGlvbiAvIHBhcnNlckFkZENoaWxkIC8gYXR0YWNoIGJ1c2luZXNzIHNob3Vs ZAotICAgICAgICAvLyAgICAgICAgYmUgaW4gSFRNTENvbnN0cnVjdGlvblNpdGUuICBNeSBndWVz cyBpcyB0aGF0IHN0ZXBzIDgtLTEyCisgICAgICAgIC8vICAgICAgICBiZSBpbiBIVE1MQ29uc3Ry dWN0aW9uU2l0ZS4gTXkgZ3Vlc3MgaXMgdGhhdCBzdGVwcyAxMS0tMTUKICAgICAgICAgLy8gICAg ICAgIHNob3VsZCBhbGwgYmUgaW4gc29tZSBIVE1MQ29uc3RydWN0aW9uU2l0ZSBmdW5jdGlvbi4K ICAgICAgICAgZnVydGhlc3RCbG9ja0VsZW1lbnQtPnBhcnNlckFkZENoaWxkKG5ld0l0ZW0tPmVs ZW1lbnQoKSk7CisgICAgICAgIC8vIEZJWE1FOiBXaHkgaXMgdGhpcyBhdHRhY2ggbG9naWMgbmVj ZXNzYXJ5PyBTdHlsZSByZXNvbHZlIHNob3VsZCBhdHRhY2ggdXMgaWYgbmVlZGVkLgogICAgICAg ICBpZiAoZnVydGhlc3RCbG9ja0VsZW1lbnQtPmF0dGFjaGVkKCkgJiYgIW5ld0l0ZW0tPmVsZW1l bnQoKS0+YXR0YWNoZWQoKSkgewogICAgICAgICAgICAgLy8gTm90aWNlIHRoYXQgbmV3SXRlbS0+ ZWxlbWVudCgpIG1pZ2h0IGFscmVhZHkgYmUgYXR0YWNoZWQgaWYsIGZvciBleGFtcGxlLCBvbmUg b2YgdGhlIHJlcGFyZW50ZWQKICAgICAgICAgICAgIC8vIGNoaWxkcmVuIGlzIGEgc3R5bGUgZWxl bWVudCwgd2hpY2ggYXR0YWNoZXMgaXRzZWxmIGF1dG9tYXRpY2FsbHkuCiAgICAgICAgICAgICBu ZXdJdGVtLT5lbGVtZW50KCktPmF0dGFjaCgpOwogICAgICAgICB9Ci0gICAgICAgIC8vIDExCisg ICAgICAgIC8vIDE0LgogICAgICAgICBtX3RyZWUuYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCkt PnN3YXBUbyhmb3JtYXR0aW5nRWxlbWVudCwgbmV3SXRlbSwgYm9va21hcmspOwotICAgICAgICAv LyAxMgorICAgICAgICAvLyAxNS4KICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5yZW1v dmUoZm9ybWF0dGluZ0VsZW1lbnQpOwogICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPmlu c2VydEFib3ZlKG5ld0l0ZW0sIGZ1cnRoZXN0QmxvY2spOwogICAgIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odG1s NWxpYi9ydW5uZXItZXhwZWN0ZWQudHh0CmluZGV4IDNmNjg4MDFmNWM5MjY2OWI2ZWEzNzcxZGIx ZGNiYzNlYjcyYjdlMDkuLjFjNjEwZDYwMGIyOGIyZDM5MzgzYjc2MjU2OWI3ZTQ0ZTFiNWM5MGMg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLnR4dApAQCAtOSw3ICs5LDYg QEAgQ09OU09MRSBNRVNTQUdFOiBsaW5lIDI6IFBBU1MKIENPTlNPTEUgTUVTU0FHRTogbGluZSAy OiBGT088c3Bhbj5CQVI8L3NwYW4+QkFaCiByZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQ6CiAxNAot MTYKIAogVGVzdCAxNCBvZiAxNyBpbiByZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJ bnB1dDoKIDxkaXY+PGE+PGI+PGRpdj48ZGl2PjxkaXY+PGRpdj48ZGl2PjxkaXY+PGRpdj48ZGl2 PjxkaXY+PGRpdj48L2E+CkBAIC02NSwyOSArNjQsNiBAQCBFeHBlY3RlZDoKIHwgICAgICAgICAg ICAgICAgICAgICAgICAgPGE+CiB8ICAgICAgICAgICAgICAgICAgICAgICAgIDxkaXY+CiB8ICAg ICAgICAgICAgICAgICAgICAgICAgICAgPGRpdj4KLQotVGVzdCAxNiBvZiAxNyBpbiByZXNvdXJj ZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKLTxiPjxiPjxiPjxiPng8L2I+PC9iPjwv Yj48L2I+eQotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxi PgotfCAgICAgICA8Yj4KLXwgICAgICAgICA8Yj4KLXwgICAgICAgICAgIDxiPgotfCAgICAgICAg ICAgICAieCIKLXwgICAgICAgInkiCi1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18 ICAgPGJvZHk+Ci18ICAgICA8Yj4KLXwgICAgICAgPGI+Ci18ICAgICAgICAgPGI+Ci18ICAgICAg ICAgICA8Yj4KLXwgICAgICAgICAgICAgIngiCi18ICAgICAieSIKIHJlc291cmNlcy9hZG9wdGlv bjAyLmRhdDogUEFTUwogCiByZXNvdXJjZXMvY29tbWVudHMwMS5kYXQ6IFBBU1MK