60249 2011-05-04 22:51:53 -0700 Make RenderStyle::setColumnBreakInside() reject unsupported enum values. 2011-05-08 22:47:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned abarth commit-queue dglazkov eric macpherson webkit.review.bot oldest_to_newest 398555 0 macpherson 2011-05-04 22:51:53 -0700 Make RenderStyle::setColumnBreakInside() reject unsupported enum values. 398556 1 92375 macpherson 2011-05-04 22:52:53 -0700 Created attachment 92375 Patch 398560 2 92375 eric 2011-05-04 22:55:42 -0700 Comment on attachment 92375 Patch I'm confused why we'd want this change. It seems render style is a dumb storage class and CSSStyleSelector shoudl be where all the mapping logic is. 398580 3 macpherson 2011-05-04 23:42:04 -0700 (In reply to comment #2) > (From update of attachment 92375 [details]) > I'm confused why we'd want this change. It seems render style is a dumb storage class and CSSStyleSelector shoudl be where all the mapping logic is. See: http://www.w3.org/TR/css3-multicol/#break-before-break-after-break-inside It boils down to "always" is never a valid thing to set for this property. It is only in the enum because the enum is being shared with break-before and break-after. The reason I want to remove it from CSSStyleSelector is that I am trying to make that code as homogeneous as possible so that we can have as much code sharing as possible when the property handling is moved into CSSStyleApplyProperty. 398583 4 eric 2011-05-04 23:48:21 -0700 So can we ever be passed in the "always" value? For properties which have valid values, but they are invalid for specific elements we fix up the values in CSSStyleSelector::adjustRenderStyle. A good example is overflow "scroll" and "auto" in SVG content. Totally valid values (which might be set accidentally by CSS), but they don't have meanings in SVG so they get mapped to other values. Is that the case here? 398584 5 eric 2011-05-04 23:49:06 -0700 If it's never possible to intentionally pass in "always" here, then we should be ASSERTing. :) And certainly commenting to explain what we're doing (as I think I noted in the other bug). Thanks again for the cleanup work! 399265 6 92520 macpherson 2011-05-05 18:25:49 -0700 Created attachment 92520 Patch 399280 7 92527 macpherson 2011-05-05 18:44:23 -0700 Created attachment 92527 Patch 399281 8 macpherson 2011-05-05 18:47:35 -0700 ASSERT and comment added. 399285 9 92527 eric 2011-05-05 19:06:43 -0700 Comment on attachment 92527 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92527&action=review > Source/WebCore/rendering/style/RenderStyle.h:1077 > + void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBALWAYS || p == PBAVOID); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); } I thought PBALWAS was not allowed? 399298 10 macpherson 2011-05-05 20:16:42 -0700 (In reply to comment #9) > (From update of attachment 92527 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=92527&action=review > > > Source/WebCore/rendering/style/RenderStyle.h:1077 > > + void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBALWAYS || p == PBAVOID); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); } > > I thought PBALWAS was not allowed? Yeah, that's why I removed the r? until I had a chance to fix. 399306 11 92534 macpherson 2011-05-05 20:36:18 -0700 Created attachment 92534 Patch 399307 12 macpherson 2011-05-05 20:37:48 -0700 (In reply to comment #11) > Created an attachment (id=92534) [details] > Patch (In reply to comment #10) > (In reply to comment #9) > > (From update of attachment 92527 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=92527&action=review > > > > > Source/WebCore/rendering/style/RenderStyle.h:1077 > > > + void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBALWAYS || p == PBAVOID); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); } > > > > I thought PBALWAS was not allowed? > > Yeah, that's why I removed the r? until I had a chance to fix. Fixed. 399328 13 92534 eric 2011-05-05 22:24:07 -0700 Comment on attachment 92534 Patch Thanks. 399383 14 92534 commit-queue 2011-05-06 00:32:10 -0700 Comment on attachment 92534 Patch Rejecting attachment 92534 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'land-a..." exit_code: 2 Last 500 characters of output: umpRenderTree/gtk/LayoutTestControllerGtk.cpp M Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp M Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm M Tools/DumpRenderTree/LayoutTestController.cpp M Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp M Tools/DumpRenderTree/LayoutTestController.h M Tools/ChangeLog r85925 = be02bf169625268c108523a7e9db4f1a365608d6 (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. Full output: http://queues.webkit.org/results/8571716 400305 15 92751 macpherson 2011-05-08 16:37:05 -0700 Created attachment 92751 Patch 400306 16 macpherson 2011-05-08 16:37:56 -0700 Fixed ChangeLog. 400316 17 commit-queue 2011-05-08 19:15:31 -0700 The commit-queue encountered the following flaky tests while processing attachment 92751: http/tests/xmlhttprequest/cross-origin-no-authorization.html bug 33357 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 400317 18 92751 commit-queue 2011-05-08 19:16:52 -0700 Comment on attachment 92751 Patch Clearing flags on attachment: 92751 Committed r86040: <http://trac.webkit.org/changeset/86040> 400318 19 commit-queue 2011-05-08 19:16:57 -0700 All reviewed patches have been landed. Closing bug. 400348 20 webkit.review.bot 2011-05-08 22:47:26 -0700 http://trac.webkit.org/changeset/86040 might have broken GTK Linux 32-bit Debug The following tests are not passing: svg/W3C-SVG-1.1/animate-elem-82-t.svg 92375 2011-05-04 22:52:53 -0700 2011-05-05 18:25:38 -0700 Patch bug-60249-20110505155251.patch text/plain 3295 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODMzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDQgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRDb2x1bW5C cmVha0luc2lkZSgpIHJlamVjdCB1bnN1cHBvcnRlZCBlbnVtIHZhbHVlcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMjQ5CisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAg ICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBjb2RlIGFuZCB1c2UgYXBwcm9wcmlhdGUgbWFjcm8u CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgIChXZWJD b3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0Q29sdW1uQnJlYWtJbnNpZGUpOgorICAgICAgICBDaGVj ayBmb3IgdW5zdXBwb3J0ZWQgdmFsdWVzIGFuZCBpZ25vcmUgdGhlbS4KKwogMjAxMS0wNS0wNCAg Unlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBF cmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJ KHJldmlzaW9uIDg1ODMwKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3Iu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MDY0LDEzICs1MDY0LDkgQEAgdm9pZCBDU1NTdHlsZVNl bGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1 bW5CcmVha0FmdGVyOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJ TUlUSVZFX1dJVEhfVkFMVUUoY29sdW1uQnJlYWtBZnRlciwgQ29sdW1uQnJlYWtBZnRlciwgUGFn ZUJyZWFrKQogICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVt bkJyZWFrSW5zaWRlOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX1dJVEhf VkFMVUUoY29sdW1uQnJlYWtJbnNpZGUsIENvbHVtbkJyZWFrSW5zaWRlLCBQYWdlQnJlYWspCi0g ICAgICAgIEVQYWdlQnJlYWsgcGIgPSAqcHJpbWl0aXZlVmFsdWU7Ci0gICAgICAgIGlmIChwYiAh PSBQQkFMV0FZUykKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldENvbHVtbkJyZWFrSW5zaWRlKHBi KTsKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGU6CisgICAgICAg IEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkVfV0lUSF9WQUxVRShjb2x1 bW5CcmVha0luc2lkZSwgQ29sdW1uQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykKICAgICAgICAgcmV0 dXJuOwotICAgIH0KICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblJ1bGU6CiAgICAg ICAgIGlmIChpc0luaGVyaXQpIHsKICAgICAgICAgICAgIG1fc3R5bGUtPnNldENvbHVtblJ1bGVD b2xvcihtX3BhcmVudFN0eWxlLT5jb2x1bW5SdWxlQ29sb3IoKS5pc1ZhbGlkKCkgPyBtX3BhcmVu dFN0eWxlLT5jb2x1bW5SdWxlQ29sb3IoKSA6IG1fcGFyZW50U3R5bGUtPmNvbG9yKCkpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlz aW9uIDg1ODMwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNzMsNyArMTA3MywxMSBAQCBwdWJsaWM6CiAgICAgdm9p ZCByZXNldENvbHVtblJ1bGUoKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNz KCktPm1fbXVsdGlDb2wsIG1fcnVsZSwgQm9yZGVyVmFsdWUoKSkgfQogICAgIHZvaWQgc2V0Q29s dW1uU3Bhbihib29sIGIpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ bV9tdWx0aUNvbCwgbV9jb2x1bW5TcGFuLCBiKTsgfQogICAgIHZvaWQgc2V0Q29sdW1uQnJlYWtC ZWZvcmUoRVBhZ2VCcmVhayBwKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNz KCktPm1fbXVsdGlDb2wsIG1fYnJlYWtCZWZvcmUsIHApOyB9Ci0gICAgdm9pZCBzZXRDb2x1bW5C cmVha0luc2lkZShFUGFnZUJyZWFrIHApIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5h Y2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9icmVha0luc2lkZSwgcCk7IH0KKyAgICBpbmxpbmUgdm9p ZCBzZXRDb2x1bW5CcmVha0luc2lkZShFUGFnZUJyZWFrIHApCisgICAgeworICAgICAgICBpZiAo cCAhPSBQQkFMV0FZUykKKyAgICAgICAgICAgIFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEu YWNjZXNzKCktPm1fbXVsdGlDb2wsIG1fYnJlYWtJbnNpZGUsIHApOworICAgIH0KICAgICB2b2lk IHNldENvbHVtbkJyZWFrQWZ0ZXIoRVBhZ2VCcmVhayBwKSB7IFNFVF9WQVIocmFyZU5vbkluaGVy aXRlZERhdGEuYWNjZXNzKCktPm1fbXVsdGlDb2wsIG1fYnJlYWtBZnRlciwgcCk7IH0KICAgICB2 b2lkIGluaGVyaXRDb2x1bW5Qcm9wZXJ0aWVzRnJvbShSZW5kZXJTdHlsZSogcGFyZW50KSB7IHJh cmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sID0gcGFyZW50LT5yYXJlTm9u SW5oZXJpdGVkRGF0YS0+bV9tdWx0aUNvbDsgfQogICAgIHZvaWQgc2V0VHJhbnNmb3JtKGNvbnN0 IFRyYW5zZm9ybU9wZXJhdGlvbnMmIG9wcykgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRh LmFjY2VzcygpLT5tX3RyYW5zZm9ybSwgbV9vcGVyYXRpb25zLCBvcHMpOyB9Cg== 92520 2011-05-05 18:25:49 -0700 2011-05-05 18:44:12 -0700 Patch bug-60249-20110506112546.patch text/plain 3397 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRDb2x1bW5C cmVha0luc2lkZSgpIHJlamVjdCB1bnN1cHBvcnRlZCBlbnVtIHZhbHVlcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMjQ5CisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAg ICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBjb2RlIGFuZCB1c2UgYXBwcm9wcmlhdGUgbWFjcm8u CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgIChXZWJD b3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0Q29sdW1uQnJlYWtJbnNpZGUpOgorICAgICAgICBBc3Nl cnQgdGhhdCB1bnN1cHBvcnRlZCB2YWx1ZXMgYXJlIG5vdCB1c2VkLgorCiAyMDExLTA1LTA1ICBB bmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj IFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJl dmlzaW9uIDg1OTA4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01MDEyLDEzICs1MDEyLDkgQEAgdm9pZCBDU1NTdHlsZVNlbGVj dG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5C cmVha0FmdGVyOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlU SVZFX1dJVEhfVkFMVUUoY29sdW1uQnJlYWtBZnRlciwgQ29sdW1uQnJlYWtBZnRlciwgUGFnZUJy ZWFrKQogICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJy ZWFrSW5zaWRlOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX1dJVEhfVkFM VUUoY29sdW1uQnJlYWtJbnNpZGUsIENvbHVtbkJyZWFrSW5zaWRlLCBQYWdlQnJlYWspCi0gICAg ICAgIEVQYWdlQnJlYWsgcGIgPSAqcHJpbWl0aXZlVmFsdWU7Ci0gICAgICAgIGlmIChwYiAhPSBQ QkFMV0FZUykKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldENvbHVtbkJyZWFrSW5zaWRlKHBiKTsK KyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGU6CisgICAgICAgIEhB TkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkVfV0lUSF9WQUxVRShjb2x1bW5C cmVha0luc2lkZSwgQ29sdW1uQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykKICAgICAgICAgcmV0dXJu OwotICAgIH0KICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblJ1bGU6CiAgICAgICAg IGlmIChpc0luaGVyaXQpIHsKICAgICAgICAgICAgIG1fc3R5bGUtPnNldENvbHVtblJ1bGVDb2xv cihtX3BhcmVudFN0eWxlLT5jb2x1bW5SdWxlQ29sb3IoKS5pc1ZhbGlkKCkgPyBtX3BhcmVudFN0 eWxlLT5jb2x1bW5SdWxlQ29sb3IoKSA6IG1fcGFyZW50U3R5bGUtPmNvbG9yKCkpOwpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9u IDg1OTA4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTEwNzMsNyArMTA3Myw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJl c2V0Q29sdW1uUnVsZSgpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ bV9tdWx0aUNvbCwgbV9ydWxlLCBCb3JkZXJWYWx1ZSgpKSB9CiAgICAgdm9pZCBzZXRDb2x1bW5T cGFuKGJvb2wgYikgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX211 bHRpQ29sLCBtX2NvbHVtblNwYW4sIGIpOyB9CiAgICAgdm9pZCBzZXRDb2x1bW5CcmVha0JlZm9y ZShFUGFnZUJyZWFrIHApIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ bV9tdWx0aUNvbCwgbV9icmVha0JlZm9yZSwgcCk7IH0KLSAgICB2b2lkIHNldENvbHVtbkJyZWFr SW5zaWRlKEVQYWdlQnJlYWsgcCkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2Vz cygpLT5tX211bHRpQ29sLCBtX2JyZWFrSW5zaWRlLCBwKTsgfQorICAgIC8vIFBCQUxXQVlTIGlz IG5vdCBhIHZhbGlkIHZhbHVlIGZvciBjb2x1bW4tYnJlYWstaW5zaWRlLiBTZWUgaHR0cDovL3d3 dy53My5vcmcvVFIvY3NzMy1tdWx0aWNvbC8jYnJlYWstYmVmb3JlLWJyZWFrLWFmdGVyLWJyZWFr LWluc2lkZQorICAgIHZvaWQgc2V0Q29sdW1uQnJlYWtJbnNpZGUoRVBhZ2VCcmVhayBwKSB7IEFT U0VSVChwICE9IFBCQUxXQVlTKTsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3Mo KS0+bV9tdWx0aUNvbCwgbV9icmVha0luc2lkZSwgcCk7IH0KICAgICB2b2lkIHNldENvbHVtbkJy ZWFrQWZ0ZXIoRVBhZ2VCcmVhayBwKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNj ZXNzKCktPm1fbXVsdGlDb2wsIG1fYnJlYWtBZnRlciwgcCk7IH0KICAgICB2b2lkIGluaGVyaXRD b2x1bW5Qcm9wZXJ0aWVzRnJvbShSZW5kZXJTdHlsZSogcGFyZW50KSB7IHJhcmVOb25Jbmhlcml0 ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sID0gcGFyZW50LT5yYXJlTm9uSW5oZXJpdGVkRGF0 YS0+bV9tdWx0aUNvbDsgfQogICAgIHZvaWQgc2V0VHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybU9w ZXJhdGlvbnMmIG9wcykgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5t X3RyYW5zZm9ybSwgbV9vcGVyYXRpb25zLCBvcHMpOyB9Cg== 92527 2011-05-05 18:44:23 -0700 2011-05-05 20:36:06 -0700 Patch bug-60249-20110506114420.patch text/plain 3392 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRDb2x1bW5C cmVha0luc2lkZSgpIHJlamVjdCB1bnN1cHBvcnRlZCBlbnVtIHZhbHVlcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMjQ5CisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAg ICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBjb2RlIGFuZCB1c2UgYXBwcm9wcmlhdGUgbWFjcm8u CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgIChXZWJD b3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0Q29sdW1uQnJlYWtJbnNpZGUpOgorICAgICAgICBBc3Nl cnQgdGhhdCBzdXBwb3J0ZWQgdmFsdWVzIGFyZSB1c2VkLgorCiAyMDExLTA1LTA1ICBBbmR5IEVz dGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl bC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9u IDg1OTA4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC01MDEyLDEzICs1MDEyLDkgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjph cHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0Fm dGVyOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFX1dJ VEhfVkFMVUUoY29sdW1uQnJlYWtBZnRlciwgQ29sdW1uQnJlYWtBZnRlciwgUGFnZUJyZWFrKQog ICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrSW5z aWRlOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX1dJVEhfVkFMVUUoY29s dW1uQnJlYWtJbnNpZGUsIENvbHVtbkJyZWFrSW5zaWRlLCBQYWdlQnJlYWspCi0gICAgICAgIEVQ YWdlQnJlYWsgcGIgPSAqcHJpbWl0aXZlVmFsdWU7Ci0gICAgICAgIGlmIChwYiAhPSBQQkFMV0FZ UykKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldENvbHVtbkJyZWFrSW5zaWRlKHBiKTsKKyAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGU6CisgICAgICAgIEhBTkRMRV9J TkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkVfV0lUSF9WQUxVRShjb2x1bW5CcmVha0lu c2lkZSwgQ29sdW1uQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykKICAgICAgICAgcmV0dXJuOwotICAg IH0KICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblJ1bGU6CiAgICAgICAgIGlmIChp c0luaGVyaXQpIHsKICAgICAgICAgICAgIG1fc3R5bGUtPnNldENvbHVtblJ1bGVDb2xvcihtX3Bh cmVudFN0eWxlLT5jb2x1bW5SdWxlQ29sb3IoKS5pc1ZhbGlkKCkgPyBtX3BhcmVudFN0eWxlLT5j b2x1bW5SdWxlQ29sb3IoKSA6IG1fcGFyZW50U3R5bGUtPmNvbG9yKCkpOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDg1OTA4 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtp bmcgY29weSkKQEAgLTEwNzMsNyArMTA3Myw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlc2V0Q29s dW1uUnVsZSgpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0 aUNvbCwgbV9ydWxlLCBCb3JkZXJWYWx1ZSgpKSB9CiAgICAgdm9pZCBzZXRDb2x1bW5TcGFuKGJv b2wgYikgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29s LCBtX2NvbHVtblNwYW4sIGIpOyB9CiAgICAgdm9pZCBzZXRDb2x1bW5CcmVha0JlZm9yZShFUGFn ZUJyZWFrIHApIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0 aUNvbCwgbV9icmVha0JlZm9yZSwgcCk7IH0KLSAgICB2b2lkIHNldENvbHVtbkJyZWFrSW5zaWRl KEVQYWdlQnJlYWsgcCkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5t X211bHRpQ29sLCBtX2JyZWFrSW5zaWRlLCBwKTsgfQorICAgIC8vIEZvciB2YWxpZCB2YWx1ZXMg b2YgY29sdW1uLWJyZWFrLWluc2lkZSBzZWUgaHR0cDovL3d3dy53My5vcmcvVFIvY3NzMy1tdWx0 aWNvbC8jYnJlYWstYmVmb3JlLWJyZWFrLWFmdGVyLWJyZWFrLWluc2lkZQorICAgIHZvaWQgc2V0 Q29sdW1uQnJlYWtJbnNpZGUoRVBhZ2VCcmVhayBwKSB7IEFTU0VSVChwID09IFBCQUxXQVlTIHx8 IHAgPT0gUEJBVk9JRCk7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1f bXVsdGlDb2wsIG1fYnJlYWtJbnNpZGUsIHApOyB9CiAgICAgdm9pZCBzZXRDb2x1bW5CcmVha0Fm dGVyKEVQYWdlQnJlYWsgcCkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2Vzcygp LT5tX211bHRpQ29sLCBtX2JyZWFrQWZ0ZXIsIHApOyB9CiAgICAgdm9pZCBpbmhlcml0Q29sdW1u UHJvcGVydGllc0Zyb20oUmVuZGVyU3R5bGUqIHBhcmVudCkgeyByYXJlTm9uSW5oZXJpdGVkRGF0 YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCA9IHBhcmVudC0+cmFyZU5vbkluaGVyaXRlZERhdGEtPm1f bXVsdGlDb2w7IH0KICAgICB2b2lkIHNldFRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1PcGVyYXRp b25zJiBvcHMpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV90cmFu c2Zvcm0sIG1fb3BlcmF0aW9ucywgb3BzKTsgfQo= 92534 2011-05-05 20:36:18 -0700 2011-05-08 16:36:53 -0700 Patch bug-60249-20110506133615.patch text/plain 3398 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTEzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRDb2x1bW5C cmVha0luc2lkZSgpIHJlamVjdCB1bnN1cHBvcnRlZCBlbnVtIHZhbHVlcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMjQ5CisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAg ICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBjb2RlIGFuZCB1c2UgYXBwcm9wcmlhdGUgbWFjcm8u CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgIChXZWJD b3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0Q29sdW1uQnJlYWtJbnNpZGUpOgorICAgICAgICBBc3Nl cnQgdGhhdCBzdXBwb3J0ZWQgdmFsdWVzIGFyZSB1c2VkLgorCiAyMDExLTA1LTA1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAko cmV2aXNpb24gODU5MTMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTUwMTIsMTMgKzUwMTIsOSBAQCB2b2lkIENTU1N0eWxlU2Vs ZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVt bkJyZWFrQWZ0ZXI6CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklN SVRJVkVfV0lUSF9WQUxVRShjb2x1bW5CcmVha0FmdGVyLCBDb2x1bW5CcmVha0FmdGVyLCBQYWdl QnJlYWspCiAgICAgICAgIHJldHVybjsKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1u QnJlYWtJbnNpZGU6IHsKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfV0lUSF9W QUxVRShjb2x1bW5CcmVha0luc2lkZSwgQ29sdW1uQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykKLSAg ICAgICAgRVBhZ2VCcmVhayBwYiA9ICpwcmltaXRpdmVWYWx1ZTsKLSAgICAgICAgaWYgKHBiICE9 IFBCQUxXQVlTKQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Q29sdW1uQnJlYWtJbnNpZGUocGIp OworICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0luc2lkZToKKyAgICAgICAg SEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRV9XSVRIX1ZBTFVFKGNvbHVt bkJyZWFrSW5zaWRlLCBDb2x1bW5CcmVha0luc2lkZSwgUGFnZUJyZWFrKQogICAgICAgICByZXR1 cm47Ci0gICAgfQogICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVsZToKICAgICAg ICAgaWYgKGlzSW5oZXJpdCkgewogICAgICAgICAgICAgbV9zdHlsZS0+c2V0Q29sdW1uUnVsZUNv bG9yKG1fcGFyZW50U3R5bGUtPmNvbHVtblJ1bGVDb2xvcigpLmlzVmFsaWQoKSA/IG1fcGFyZW50 U3R5bGUtPmNvbHVtblJ1bGVDb2xvcigpIDogbV9wYXJlbnRTdHlsZS0+Y29sb3IoKSk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNp b24gODU5MTMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aAkod29ya2luZyBjb3B5KQpAQCAtMTA3Myw3ICsxMDczLDggQEAgcHVibGljOgogICAgIHZvaWQg cmVzZXRDb2x1bW5SdWxlKCkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2Vzcygp LT5tX211bHRpQ29sLCBtX3J1bGUsIEJvcmRlclZhbHVlKCkpIH0KICAgICB2b2lkIHNldENvbHVt blNwYW4oYm9vbCBiKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1f bXVsdGlDb2wsIG1fY29sdW1uU3BhbiwgYik7IH0KICAgICB2b2lkIHNldENvbHVtbkJyZWFrQmVm b3JlKEVQYWdlQnJlYWsgcCkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2Vzcygp LT5tX211bHRpQ29sLCBtX2JyZWFrQmVmb3JlLCBwKTsgfQotICAgIHZvaWQgc2V0Q29sdW1uQnJl YWtJbnNpZGUoRVBhZ2VCcmVhayBwKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNj ZXNzKCktPm1fbXVsdGlDb2wsIG1fYnJlYWtJbnNpZGUsIHApOyB9CisgICAgLy8gRm9yIHZhbGlk IHZhbHVlcyBvZiBjb2x1bW4tYnJlYWstaW5zaWRlIHNlZSBodHRwOi8vd3d3LnczLm9yZy9UUi9j c3MzLW11bHRpY29sLyNicmVhay1iZWZvcmUtYnJlYWstYWZ0ZXItYnJlYWstaW5zaWRlCisgICAg dm9pZCBzZXRDb2x1bW5CcmVha0luc2lkZShFUGFnZUJyZWFrIHApIHsgQVNTRVJUKHAgPT0gUEJB VVRPIHx8IHAgPT0gUEJBVk9JRCk7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNz KCktPm1fbXVsdGlDb2wsIG1fYnJlYWtJbnNpZGUsIHApOyB9CiAgICAgdm9pZCBzZXRDb2x1bW5C cmVha0FmdGVyKEVQYWdlQnJlYWsgcCkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFj Y2VzcygpLT5tX211bHRpQ29sLCBtX2JyZWFrQWZ0ZXIsIHApOyB9CiAgICAgdm9pZCBpbmhlcml0 Q29sdW1uUHJvcGVydGllc0Zyb20oUmVuZGVyU3R5bGUqIHBhcmVudCkgeyByYXJlTm9uSW5oZXJp dGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCA9IHBhcmVudC0+cmFyZU5vbkluaGVyaXRlZERh dGEtPm1fbXVsdGlDb2w7IH0KICAgICB2b2lkIHNldFRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1P cGVyYXRpb25zJiBvcHMpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ bV90cmFuc2Zvcm0sIG1fb3BlcmF0aW9ucywgb3BzKTsgfQo= 92751 2011-05-08 16:37:05 -0700 2011-05-08 19:16:51 -0700 Patch bug-60249-20110509093702.patch text/plain 3414 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MDM4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDggIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBFcmljIFNlaWRlbC4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRDb2x1bW5CcmVh a0luc2lkZSgpIHJlamVjdCB1bnN1cHBvcnRlZCBlbnVtIHZhbHVlcy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMjQ5CisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGFkZGVkIGFzIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGNz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0 b3I6OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBSZW1vdmUgc3BlY2lhbC1jYXNlIGNvZGUgYW5k IHVzZSBhcHByb3ByaWF0ZSBtYWNyby4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRDb2x1bW5CcmVh a0luc2lkZSk6CisgICAgICAgIEFzc2VydCB0aGF0IHN1cHBvcnRlZCB2YWx1ZXMgYXJlIHVzZWQu CisKIDIwMTEtMDUtMDggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDg2MDM4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OTc5LDEzICs0OTc5LDkgQEAg dm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRDb2x1bW5CcmVha0FmdGVyOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRf SU5JVElBTF9BTkRfUFJJTUlUSVZFX1dJVEhfVkFMVUUoY29sdW1uQnJlYWtBZnRlciwgQ29sdW1u QnJlYWtBZnRlciwgUGFnZUJyZWFrKQogICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdENvbHVtbkJyZWFrSW5zaWRlOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FO RF9JTklUSUFMX1dJVEhfVkFMVUUoY29sdW1uQnJlYWtJbnNpZGUsIENvbHVtbkJyZWFrSW5zaWRl LCBQYWdlQnJlYWspCi0gICAgICAgIEVQYWdlQnJlYWsgcGIgPSAqcHJpbWl0aXZlVmFsdWU7Ci0g ICAgICAgIGlmIChwYiAhPSBQQkFMV0FZUykKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldENvbHVt bkJyZWFrSW5zaWRlKHBiKTsKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtJ bnNpZGU6CisgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkVf V0lUSF9WQUxVRShjb2x1bW5CcmVha0luc2lkZSwgQ29sdW1uQnJlYWtJbnNpZGUsIFBhZ2VCcmVh aykKICAgICAgICAgcmV0dXJuOwotICAgIH0KICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENv bHVtblJ1bGU6CiAgICAgICAgIGlmIChpc0luaGVyaXQpIHsKICAgICAgICAgICAgIG1fc3R5bGUt PnNldENvbHVtblJ1bGVDb2xvcihtX3BhcmVudFN0eWxlLT5jb2x1bW5SdWxlQ29sb3IoKS5pc1Zh bGlkKCkgPyBtX3BhcmVudFN0eWxlLT5jb2x1bW5SdWxlQ29sb3IoKSA6IG1fcGFyZW50U3R5bGUt PmNvbG9yKCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmgJKHJldmlzaW9uIDg2MDM4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNzUsNyArMTA3NSw4IEBAIHB1 YmxpYzoKICAgICB2b2lkIHJlc2V0Q29sdW1uUnVsZSgpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJp dGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9ydWxlLCBCb3JkZXJWYWx1ZSgpKSB9CiAg ICAgdm9pZCBzZXRDb2x1bW5TcGFuKGJvb2wgYikgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWRE YXRhLmFjY2VzcygpLT5tX211bHRpQ29sLCBtX2NvbHVtblNwYW4sIGIpOyB9CiAgICAgdm9pZCBz ZXRDb2x1bW5CcmVha0JlZm9yZShFUGFnZUJyZWFrIHApIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJp dGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9icmVha0JlZm9yZSwgcCk7IH0KLSAgICB2 b2lkIHNldENvbHVtbkJyZWFrSW5zaWRlKEVQYWdlQnJlYWsgcCkgeyBTRVRfVkFSKHJhcmVOb25J bmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sLCBtX2JyZWFrSW5zaWRlLCBwKTsgfQor ICAgIC8vIEZvciB2YWxpZCB2YWx1ZXMgb2YgY29sdW1uLWJyZWFrLWluc2lkZSBzZWUgaHR0cDov L3d3dy53My5vcmcvVFIvY3NzMy1tdWx0aWNvbC8jYnJlYWstYmVmb3JlLWJyZWFrLWFmdGVyLWJy ZWFrLWluc2lkZQorICAgIHZvaWQgc2V0Q29sdW1uQnJlYWtJbnNpZGUoRVBhZ2VCcmVhayBwKSB7 IEFTU0VSVChwID09IFBCQVVUTyB8fCBwID09IFBCQVZPSUQpOyBTRVRfVkFSKHJhcmVOb25Jbmhl cml0ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sLCBtX2JyZWFrSW5zaWRlLCBwKTsgfQogICAg IHZvaWQgc2V0Q29sdW1uQnJlYWtBZnRlcihFUGFnZUJyZWFrIHApIHsgU0VUX1ZBUihyYXJlTm9u SW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9icmVha0FmdGVyLCBwKTsgfQog ICAgIHZvaWQgaW5oZXJpdENvbHVtblByb3BlcnRpZXNGcm9tKFJlbmRlclN0eWxlKiBwYXJlbnQp IHsgcmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fbXVsdGlDb2wgPSBwYXJlbnQtPnJh cmVOb25Jbmhlcml0ZWREYXRhLT5tX211bHRpQ29sOyB9CiAgICAgdm9pZCBzZXRUcmFuc2Zvcm0o Y29uc3QgVHJhbnNmb3JtT3BlcmF0aW9ucyYgb3BzKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRl ZERhdGEuYWNjZXNzKCktPm1fdHJhbnNmb3JtLCBtX29wZXJhdGlvbnMsIG9wcyk7IH0K