101985 2012-11-12 14:03:19 -0800 JSC: JSEventListener should not access its JSFunction if its wrapper is gone 2012-11-14 14:10:38 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 102183 1 mark.lam mark.lam ap ggaren ossy roger_fong oldest_to_newest 764799 0 mark.lam 2012-11-12 14:03:19 -0800 Adding a few null checks to enforce that JSEventListener::m_jsFunction is not accessed when its m_wrapper is NULL. ref: <rdar://problem/11760332> 765023 1 173769 mark.lam 2012-11-12 17:28:43 -0800 Created attachment 173769 1st draft. 765437 2 173769 buildbot 2012-11-13 03:04:03 -0800 Comment on attachment 173769 1st draft. Attachment 173769 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14806958 New failing tests: editing/selection/4895428-2.html editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html css3/flexbox/relayout-image-load.html animations/suspend-resume-animation-events.html animations/fill-mode-forwards2.html editing/input/set-value-on-input-and-delete.html accessibility/label-element-press.html editing/spelling/spellcheck-input-search-crash.html editing/selection/4776665.html editing/style/iframe-onload-crash-unix.html editing/execCommand/paste-1.html editing/style/iframe-onload-crash-win.html http/tests/cache/cancel-during-revalidation-succeeded.html fast/block/float/float-in-float-hit-testing.html editing/execCommand/copy-without-selection.html editing/spelling/spellcheck-async-remove-frame.html editing/input/set-value-on-input-and-type-textarea.html http/tests/cache/post-with-cached-subresources.php accessibility/media-element.html editing/input/set-value-on-input-and-forward-delete.html animations/fill-mode-forwards.html editing/execCommand/5939887.html editing/style/iframe-onload-crash-mac.html editing/pasteboard/copy-paste-pre-line-content.html compositing/iframes/layout-on-compositing-change.html compositing/video/video-poster.html editing/pasteboard/copy-resolves-urls.html editing/input/set-value-on-input-and-type-input.html http/tests/cache/post-redirect-get.php editing/pasteboard/copy-standalone-image.html 765688 3 173909 mark.lam 2012-11-13 09:27:37 -0800 Created attachment 173909 Fix. 765724 4 173909 ggaren 2012-11-13 10:01:01 -0800 Comment on attachment 173909 Fix. Your ChangeLog should describe the case you discovered that makes the old ASSERT invalid. That will also explain why you didn't write a regression test. Otherwise, a future reader won't have any way to know why our old assumption was invalid. 765729 5 mark.lam 2012-11-13 10:02:07 -0800 (In reply to comment #4) > (From update of attachment 173909 [details]) > Your ChangeLog should describe the case you discovered that makes the old ASSERT invalid. That will also explain why you didn't write a regression test. Otherwise, a future reader won't have any way to know why our old assumption was invalid. Will do before landing. Thanks. 766107 6 mark.lam 2012-11-13 15:24:33 -0800 Landed in r134495: <http://trac.webkit.org/changeset/134495>. 766109 7 173909 ap 2012-11-13 15:31:54 -0800 Comment on attachment 173909 Fix. View in context: https://bugs.webkit.org/attachment.cgi?id=173909&action=review > Source/WebCore/bindings/js/JSEventListener.h:94 > ASSERT(m_wrapper || !m_jsFunction); Why did you keep this assertion? 766114 8 mark.lam 2012-11-13 15:39:22 -0800 (In reply to comment #7) > (From update of attachment 173909 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=173909&action=review > > > Source/WebCore/bindings/js/JSEventListener.h:94 > > ASSERT(m_wrapper || !m_jsFunction); > > Why did you keep this assertion? Paranoia. Plus it documents a contract between m_wrapper and m_jsFunction from that point forth. 766161 9 ggaren 2012-11-13 16:26:37 -0800 > Plus it documents a contract between m_wrapper and m_jsFunction from that point forth. Let's update the ASSERT to cover the case that is still ASSERT-able in the main thread normal world. 766180 10 174027 mark.lam 2012-11-13 16:49:50 -0800 Created attachment 174027 Fixing the assertion. 766184 11 174027 ggaren 2012-11-13 16:53:41 -0800 Comment on attachment 174027 Fixing the assertion. r=me 766187 12 mark.lam 2012-11-13 17:00:58 -0800 Assertion patch landed in r134508: <http://trac.webkit.org/changeset/134508>. 766254 13 roger_fong 2012-11-13 17:57:46 -0800 (In reply to comment #12) > Assertion patch landed in r134508: <http://trac.webkit.org/changeset/134508>. Looks like the patch did somethin funky with the windows bots. http://build.webkit.org/builders/Apple%20Win%207%20Release%20%28Tests%29/builds/29891 Looks like we have a hanging test that just keeps on hanging until run-webkit-tests times out (after 20 minutes or so) 766480 14 ossy 2012-11-13 23:16:56 -0800 It broke two tests everywhere: one fail and one timeout - https://bugs.webkit.org/show_bug.cgi?id=102183 Could you check and fix it, please? 767298 15 mark.lam 2012-11-14 14:10:38 -0800 (In reply to comment #14) > It broke two tests everywhere: one fail and one timeout - https://bugs.webkit.org/show_bug.cgi?id=102183 > > Could you check and fix it, please? FYI, the fix has landed in r134666: <http://trac.webkit.org/changeset/134666>. 173769 2012-11-12 17:28:43 -0800 2012-11-13 09:27:37 -0800 1st draft. bug-101985.patch text/plain 3160 mark.lam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNDMxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTEyICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBKU0V2ZW50TGlzdGVuZXIgc2hvdWxk IG5vdCBhY2Nlc3MgbV9qc0Z1bmN0aW9uIHdoZW4gaXRzIHdyYXBwZXIgaXMgZ29uZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTk4NS4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIGZldyBu dWxsIGNoZWNrcyBmb3IgbV93cmFwcGVyIGJlZm9yZSB3ZSBkbyBhbnl0aGluZyB3aXRoIG1fanNG dW5jdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9KU0V2ZW50TGlzdGVuZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNFdmVudExpc3RlbmVy Ojp2aXNpdEpTRnVuY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6SlNFdmVudExpc3RlbmVyOjpv cGVyYXRvcj09KToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkpTRXZlbnRMaXN0ZW5lcjo6anNGdW5jdGlvbik6CisKIDIwMTItMTEt MTIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbVjhdIE1hbnkg dGhpbmdzIGNyYXNoIHdoZW4gc3dpdGNoaW5nIHRvIFY4J3MgbmV3IGFsaWduZWQgcG9pbnRlciBB UEkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVy LmNwcAkocmV2aXNpb24gMTM0MzAwKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNF dmVudExpc3RlbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsMTAgQEAgSlNPYmpl Y3QqIEpTRXZlbnRMaXN0ZW5lcjo6aW5pdGlhbGl6ZUpTRgogCiB2b2lkIEpTRXZlbnRMaXN0ZW5l cjo6dmlzaXRKU0Z1bmN0aW9uKFNsb3RWaXNpdG9yJiB2aXNpdG9yKQogeworICAgIC8vIElmIG1f d3JhcHBlciBpcyAwLCB0aGVuIGpzRnVuY3Rpb24gaXMgem9tYmllZCwgYW5kIHNob3VsZCBuZXZl ciBiZSBhY2Nlc3NlZC4KKyAgICBpZiAoIW1fd3JhcHBlcikKKyAgICAgICAgcmV0dXJuOworCiAg ICAgaWYgKG1fanNGdW5jdGlvbikKICAgICAgICAgdmlzaXRvci5hcHBlbmQoJm1fanNGdW5jdGlv bik7CiB9CkBAIC0xNjAsNiArMTY0LDEwIEBAIGJvb2wgSlNFdmVudExpc3RlbmVyOjp2aXJ0dWFs aXNBdHRyaWJ1dGUKIAogYm9vbCBKU0V2ZW50TGlzdGVuZXI6Om9wZXJhdG9yPT0oY29uc3QgRXZl bnRMaXN0ZW5lciYgbGlzdGVuZXIpCiB7CisgICAgLy8gSWYgbV93cmFwcGVyIGlzIDAsIHRoZW4g anNGdW5jdGlvbiBpcyB6b21iaWVkLCBhbmQgc2hvdWxkIG5ldmVyIGJlIGFjY2Vzc2VkLgorICAg IGlmICghbV93cmFwcGVyKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoY29uc3Qg SlNFdmVudExpc3RlbmVyKiBqc0V2ZW50TGlzdGVuZXIgPSBKU0V2ZW50TGlzdGVuZXI6OmNhc3Qo Jmxpc3RlbmVyKSkKICAgICAgICAgcmV0dXJuIG1fanNGdW5jdGlvbiA9PSBqc0V2ZW50TGlzdGVu ZXItPm1fanNGdW5jdGlvbiAmJiBtX2lzQXR0cmlidXRlID09IGpzRXZlbnRMaXN0ZW5lci0+bV9p c0F0dHJpYnV0ZTsKICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuaAkocmV2aXNpb24gMTM0MzAwKQorKysgU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTc1LDYgKzc1LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGlubGluZSBKU0M6OkpT T2JqZWN0KiBKU0V2ZW50TGlzdGVuZXI6OmpzRnVuY3Rpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkgY29uc3QKICAgICB7CisgICAgICAgIC8vIElmIG1f d3JhcHBlciBpcyAwLCB0aGVuIGpzRnVuY3Rpb24gaXMgem9tYmllZCwgYW5kIHNob3VsZCBuZXZl ciBiZSBhY2Nlc3NlZC4KKyAgICAgICAgaWYgKCFtX3dyYXBwZXIpCisgICAgICAgICAgICByZXR1 cm4gMDsKKwogICAgICAgICAvLyBpbml0aWFsaXplSlNGdW5jdGlvbiBjYW4gdHJpZ2dlciBjb2Rl IHRoYXQgZGVsZXRlcyB0aGlzIGV2ZW50IGxpc3RlbmVyCiAgICAgICAgIC8vIGJlZm9yZSB3ZSdy ZSBkb25lLiBJdCBzaG91bGQgYWx3YXlzIHJldHVybiAwIGluIHRoaXMgY2FzZS4KICAgICAgICAg UmVmUHRyPEpTRXZlbnRMaXN0ZW5lcj4gcHJvdGVjdChjb25zdF9jYXN0PEpTRXZlbnRMaXN0ZW5l cio+KHRoaXMpKTsKQEAgLTg4LDggKzkyLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICAvLyBWZXJpZnkgdGhhdCB3ZSBoYXZlIGEgdmFsaWQgd3JhcHBlciBwcm90ZWN0aW5nIG91ciBm dW5jdGlvbiBmcm9tCiAgICAgICAgIC8vIGdhcmJhZ2UgY29sbGVjdGlvbi4KICAgICAgICAgQVNT RVJUKG1fd3JhcHBlciB8fCAhbV9qc0Z1bmN0aW9uKTsKLSAgICAgICAgaWYgKCFtX3dyYXBwZXIp Ci0gICAgICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAvLyBUcnkgdG8gdmVyaWZ5IHRoYXQg bV9qc0Z1bmN0aW9uIHdhc24ndCByZWN5Y2xlZC4gKE5vdCBleGFjdCwgc2luY2UgYW4KICAgICAg ICAgLy8gZXZlbnQgbGlzdGVuZXIgY2FuIGJlIGFsbW9zdCBhbnl0aGluZywgYnV0IHRoaXMgbWFr ZXMgdGVzdC13cml0aW5nIGVhc2llcikuCg== 173909 2012-11-13 09:27:37 -0800 2012-11-13 15:31:54 -0800 Fix. bug-101985.patch text/plain 3082 mark.lam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNDQzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTEzICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBKU0V2ZW50TGlzdGVuZXIgc2hvdWxk IG5vdCBhY2Nlc3MgbV9qc0Z1bmN0aW9uIHdoZW4gaXRzIHdyYXBwZXIgaXMgZ29uZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTk4NS4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIGZldyBu dWxsIGNoZWNrcyBmb3IgbV93cmFwcGVyIGJlZm9yZSB3ZSBkbyBhbnl0aGluZyB3aXRoIG1fanNG dW5jdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9KU0V2ZW50TGlzdGVuZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNFdmVudExpc3RlbmVy Ojppbml0aWFsaXplSlNGdW5jdGlvbik6IFJlbW92ZWQgYSBub3cgaW52YWxpZCBhc3NlcnRpb24u CisgICAgICAgIChXZWJDb3JlOjpKU0V2ZW50TGlzdGVuZXI6OnZpc2l0SlNGdW5jdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpKU0V2ZW50TGlzdGVuZXI6Om9wZXJhdG9yPT0pOgorICAgICAgICAq IGJpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5oOgorICAgICAgICAoV2ViQ29yZTo6SlNFdmVu dExpc3RlbmVyOjpqc0Z1bmN0aW9uKToKKwogMjAxMi0xMS0xMyAgRGltaXRyaSBHbGF6a292ICA8 ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHIxMzQzOTEuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVu ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRM aXN0ZW5lci5jcHAJKHJldmlzaW9uIDEzNDMwMCkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTRXZlbnRMaXN0ZW5lci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDEyICs1OSwxNSBA QCBKU0V2ZW50TGlzdGVuZXI6On5KU0V2ZW50TGlzdGVuZXIoKQogCiBKU09iamVjdCogSlNFdmVu dExpc3RlbmVyOjppbml0aWFsaXplSlNGdW5jdGlvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0Kikg Y29uc3QKIHsKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gMDsKIH0KIAog dm9pZCBKU0V2ZW50TGlzdGVuZXI6OnZpc2l0SlNGdW5jdGlvbihTbG90VmlzaXRvciYgdmlzaXRv cikKIHsKKyAgICAvLyBJZiBtX3dyYXBwZXIgaXMgMCwgdGhlbiBqc0Z1bmN0aW9uIGlzIHpvbWJp ZWQsIGFuZCBzaG91bGQgbmV2ZXIgYmUgYWNjZXNzZWQuCisgICAgaWYgKCFtX3dyYXBwZXIpCisg ICAgICAgIHJldHVybjsKKwogICAgIGlmIChtX2pzRnVuY3Rpb24pCiAgICAgICAgIHZpc2l0b3Iu YXBwZW5kKCZtX2pzRnVuY3Rpb24pOwogfQpAQCAtMTYwLDYgKzE2MywxMCBAQCBib29sIEpTRXZl bnRMaXN0ZW5lcjo6dmlydHVhbGlzQXR0cmlidXRlCiAKIGJvb2wgSlNFdmVudExpc3RlbmVyOjpv cGVyYXRvcj09KGNvbnN0IEV2ZW50TGlzdGVuZXImIGxpc3RlbmVyKQogeworICAgIC8vIElmIG1f d3JhcHBlciBpcyAwLCB0aGVuIGpzRnVuY3Rpb24gaXMgem9tYmllZCwgYW5kIHNob3VsZCBuZXZl ciBiZSBhY2Nlc3NlZC4KKyAgICBpZiAoIW1fd3JhcHBlcikKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCiAgICAgaWYgKGNvbnN0IEpTRXZlbnRMaXN0ZW5lcioganNFdmVudExpc3RlbmVyID0gSlNF dmVudExpc3RlbmVyOjpjYXN0KCZsaXN0ZW5lcikpCiAgICAgICAgIHJldHVybiBtX2pzRnVuY3Rp b24gPT0ganNFdmVudExpc3RlbmVyLT5tX2pzRnVuY3Rpb24gJiYgbV9pc0F0dHJpYnV0ZSA9PSBq c0V2ZW50TGlzdGVuZXItPm1faXNBdHRyaWJ1dGU7CiAgICAgcmV0dXJuIGZhbHNlOwpJbmRleDog U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmgJKHJldmlzaW9u IDEzNDMwMCkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5o CSh3b3JraW5nIGNvcHkpCkBAIC04NSwxMSArODUsMTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICAgICAgbV9qc0Z1bmN0aW9uLnNldE1heUJlTnVsbCgqc2NyaXB0RXhlY3V0aW9uQ29u dGV4dC0+Z2xvYmFsRGF0YSgpLCBtX3dyYXBwZXIuZ2V0KCksIGZ1bmN0aW9uKTsKICAgICAgICAg fQogCisgICAgICAgIC8vIElmIG1fd3JhcHBlciBpcyAwLCB0aGVuIGpzRnVuY3Rpb24gaXMgem9t YmllZCwgYW5kIHNob3VsZCBuZXZlciBiZSBhY2Nlc3NlZC4KKyAgICAgICAgaWYgKCFtX3dyYXBw ZXIpCisgICAgICAgICAgICByZXR1cm4gMDsKKwogICAgICAgICAvLyBWZXJpZnkgdGhhdCB3ZSBo YXZlIGEgdmFsaWQgd3JhcHBlciBwcm90ZWN0aW5nIG91ciBmdW5jdGlvbiBmcm9tCiAgICAgICAg IC8vIGdhcmJhZ2UgY29sbGVjdGlvbi4KICAgICAgICAgQVNTRVJUKG1fd3JhcHBlciB8fCAhbV9q c0Z1bmN0aW9uKTsKLSAgICAgICAgaWYgKCFtX3dyYXBwZXIpCi0gICAgICAgICAgICByZXR1cm4g MDsKIAogICAgICAgICAvLyBUcnkgdG8gdmVyaWZ5IHRoYXQgbV9qc0Z1bmN0aW9uIHdhc24ndCBy ZWN5Y2xlZC4gKE5vdCBleGFjdCwgc2luY2UgYW4KICAgICAgICAgLy8gZXZlbnQgbGlzdGVuZXIg Y2FuIGJlIGFsbW9zdCBhbnl0aGluZywgYnV0IHRoaXMgbWFrZXMgdGVzdC13cml0aW5nIGVhc2ll cikuCg== 174027 2012-11-13 16:49:50 -0800 2012-11-13 16:53:40 -0800 Fixing the assertion. bug-101985-part2.patch text/plain 1981 mark.lam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNDUwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTExLTEzICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIGFuIGFzc2VydGlvbiBpbiBK U0V2ZW50TGlzdGVuZXI6OmpzRnVuY3Rpb24oKSBtb3JlIHVzZWZ1bC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTk4NS4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYXNzZXJ0aW9uIHdhcyB3ZWFr ZW5lZCBpbiByMTM0NDk1LiBUaGlzIHN0cmVuZ3RoZW5zIGl0IGFnYWluLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cy4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5oOgor ICAgICAgICAoV2ViQ29yZTo6SlNFdmVudExpc3RlbmVyOjpqc0Z1bmN0aW9uKToKKwogMjAxMi0x MS0xMyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBs aXN0IG9mIHRyYWNrcyBpbiBjYXB0aW9uIG1lZGlhIGNvbnRyb2xzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuaAkocmV2aXNpb24gMTM0NDk3KQor KysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTg1LDE0ICs4NSwxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAg ICBtX2pzRnVuY3Rpb24uc2V0TWF5QmVOdWxsKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0LT5nbG9i YWxEYXRhKCksIG1fd3JhcHBlci5nZXQoKSwgZnVuY3Rpb24pOwogICAgICAgICB9CiAKKyAgICAg ICAgLy8gVmVyaWZ5IHRoYXQgd2UgaGF2ZSBhIHZhbGlkIHdyYXBwZXIgcHJvdGVjdGluZyBvdXIg ZnVuY3Rpb24gZnJvbQorICAgICAgICAvLyBnYXJiYWdlIGNvbGxlY3Rpb24uIFRoYXQgaXMgZXhj ZXB0IGZvciB3aGVuIHdlJ3JlIG5vdCBpbiB0aGUgbm9ybWFsCisgICAgICAgIC8vIHdvcmxkIGFu ZCBjYW4gaGF2ZSB6b21iaWUgbV9qc0Z1bmN0aW9ucy4KKyAgICAgICAgQVNTRVJUKCFtX2lzb2xh dGVkV29ybGQtPmlzTm9ybWFsKCkgfHwgbV93cmFwcGVyIHx8ICFtX2pzRnVuY3Rpb24pOworCiAg ICAgICAgIC8vIElmIG1fd3JhcHBlciBpcyAwLCB0aGVuIGpzRnVuY3Rpb24gaXMgem9tYmllZCwg YW5kIHNob3VsZCBuZXZlciBiZSBhY2Nlc3NlZC4KICAgICAgICAgaWYgKCFtX3dyYXBwZXIpCiAg ICAgICAgICAgICByZXR1cm4gMDsKIAotICAgICAgICAvLyBWZXJpZnkgdGhhdCB3ZSBoYXZlIGEg dmFsaWQgd3JhcHBlciBwcm90ZWN0aW5nIG91ciBmdW5jdGlvbiBmcm9tCi0gICAgICAgIC8vIGdh cmJhZ2UgY29sbGVjdGlvbi4KLSAgICAgICAgQVNTRVJUKG1fd3JhcHBlciB8fCAhbV9qc0Z1bmN0 aW9uKTsKLQogICAgICAgICAvLyBUcnkgdG8gdmVyaWZ5IHRoYXQgbV9qc0Z1bmN0aW9uIHdhc24n dCByZWN5Y2xlZC4gKE5vdCBleGFjdCwgc2luY2UgYW4KICAgICAgICAgLy8gZXZlbnQgbGlzdGVu ZXIgY2FuIGJlIGFsbW9zdCBhbnl0aGluZywgYnV0IHRoaXMgbWFrZXMgdGVzdC13cml0aW5nIGVh c2llcikuCiAgICAgICAgIEFTU0VSVCghbV9qc0Z1bmN0aW9uIHx8IHN0YXRpY19jYXN0PEpTQzo6 SlNDZWxsKj4obV9qc0Z1bmN0aW9uLmdldCgpKS0+aXNPYmplY3QoKSk7Cg==