28180 2009-08-11 10:33:13 -0700 [WML] WMLPageState is not allowed to store the active card, it needs to be done per document 2009-08-11 12:29:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 20393 1 zimmermann zimmermann staikos oldest_to_newest 139034 0 zimmermann 2009-08-11 10:33:13 -0700 A WMLPageState may be reused for a new document, on the same Page object. Thus the "WMLCardElement* activeCard" is not allowed to be stored there, leading to crashes under certain circumstances. Going to past a patch soon, including a reproducable test for this. 139049 1 34580 zimmermann 2009-08-11 11:39:03 -0700 Created attachment 34580 Initial patch 139064 2 zimmermann 2009-08-11 12:29:42 -0700 Sending WebCore/ChangeLog Adding WebCore/manual-tests/wml/select-onpick-event-crash.wml Sending WebCore/wml/WMLCardElement.cpp Sending WebCore/wml/WMLDoElement.cpp Sending WebCore/wml/WMLDocument.cpp Sending WebCore/wml/WMLDocument.h Sending WebCore/wml/WMLGoElement.cpp Sending WebCore/wml/WMLPageState.cpp Sending WebCore/wml/WMLPageState.h Sending WebCore/wml/WMLPrevElement.cpp Sending WebCore/wml/WMLRefreshElement.cpp Transmitting file data ........... Committed revision 47048. http://trac.webkit.org/changeset/47048 34580 2009-08-11 11:39:03 -0700 2009-08-11 11:45:05 -0700 Initial patch bug-28180-20090811203901.patch text/plain 9565 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzA0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMDktMDgtMTEgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMu emltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1dNTF0gV01MUGFnZVN0YXRlIGlzIG5vdCBhbGxvd2VkIHRv IHN0b3JlIHRoZSBhY3RpdmUgY2FyZCwgaXQgbmVlZHMgdG8gYmUgZG9uZSBwZXIgZG9jdW1lbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MTgwCisK KyAgICAgICAgRG9uJ3Qgc3RvcmUgdGhlIGFjdGl2ZSBXTUxDYXJkRWxlbWVudCBpbiBXTUxQYWdl U3RhdGUsIGJ1dCBpbiBXTUxEb2N1bWVudC4KKyAgICAgICAgT3RoZXJ3aGlzZSB0aGlzIG1heSBs ZWFkIHRvIGNyYXNoZXMgcmVsYXRlZCB0byBpbnRyaW5zaWMgZXZlbnQgZXhldWN0aW9uLgorCisg ICAgICAgIFVuZm9ydHVuYXRlbHkgc2VsZWN0IGVsZW1lbnRzIGFyZW4ndCB0ZXN0YWJsZSBieSB0 aGUgbGF5b3V0IHRlc3RzLCBzbyBhZGRpbmcKKyAgICAgICAgYSBuZXcgbWFudWFsIHRlc3QgcmVw cm9kdWNpbmcgdGhlIGNyYXNoLgorCisgICAgICAgICogbWFudWFsLXRlc3RzL3dtbC9zZWxlY3Qt b25waWNrLWV2ZW50LWNyYXNoLndtbDogQWRkZWQuCisgICAgICAgICogd21sL1dNTENhcmRFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldNTENhcmRFbGVtZW50OjpkZXRlcm1pbmVBY3Rp dmVDYXJkKToKKyAgICAgICAgKiB3bWwvV01MRG9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldNTERvRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAgICogd21sL1dN TERvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldNTERvY3VtZW50OjpmaW5pc2hlZFBh cnNpbmcpOgorICAgICAgICAqIHdtbC9XTUxEb2N1bWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6 V01MRG9jdW1lbnQ6OmFjdGl2ZUNhcmQpOgorICAgICAgICAqIHdtbC9XTUxHb0VsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6V01MR29FbGVtZW50OjpleGVjdXRlVGFzayk6CisgICAgICAg ICogd21sL1dNTFBhZ2VTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXTUxQYWdlU3RhdGU6 OldNTFBhZ2VTdGF0ZSk6CisgICAgICAgICogd21sL1dNTFBhZ2VTdGF0ZS5oOgorICAgICAgICAq IHdtbC9XTUxQcmV2RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXTUxQcmV2RWxlbWVu dDo6ZXhlY3V0ZVRhc2spOgorICAgICAgICAqIHdtbC9XTUxSZWZyZXNoRWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpXTUxSZWZyZXNoRWxlbWVudDo6ZXhlY3V0ZVRhc2spOgorCiAyMDA5 LTA4LTExICBEcmV3IFdpbHNvbiAgPGF0d2lsc29uQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL21hbnVhbC10ZXN0cy93bWwvc2Vs ZWN0LW9ucGljay1ldmVudC1jcmFzaC53bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9tYW51YWwt dGVzdHMvd21sL3NlbGVjdC1vbnBpY2stZXZlbnQtY3Jhc2gud21sCShyZXZpc2lvbiAwKQorKysg V2ViQ29yZS9tYW51YWwtdGVzdHMvd21sL3NlbGVjdC1vbnBpY2stZXZlbnQtY3Jhc2gud21sCShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEyIEBACis8P3htbCB2ZXJzaW9uPSIxLjAiPz4KKzwhRE9D VFlQRSB3bWwgUFVCTElDICItLy9XQVBGT1JVTS8vRFREIFdNTCAxLjEvL0VOIiAiaHR0cDovL3d3 dy53YXBmb3J1bS5vcmcvRFREL3dtbF8xLjEueG1sIj4KKzx3bWw+CisgICAgPGNhcmQ+CisgICAg ICAgIDxzZWxlY3QgbmFtZT0icmVzdWx0IiBkbXVsdGlwbGU9InRydWUiPgorICAgICAgICAgICAg PG9wdGlvbiBvbnBpY2s9IiNjYXJkMiIgdmFsdWU9ImZvbyI+Rm9vPC9vcHRpb24+CisgICAgICAg ICAgICA8b3B0aW9uIG9ucGljaz0iI2NhcmQyIiB2YWx1ZT0iYmFyIj5CYXI8L29wdGlvbj4KKyAg ICAgICAgPC9zZWxlY3Q+CisgICAgPC9jYXJkPgorCisgICAgPGNhcmQgaWQ9ImNhcmQyIj5UZXN0 IHBhc3MsIGlmIGl0IGRpZG4ndCBjcmFzaC48L2NhcmQ+Cis8L3dtbD4KSW5kZXg6IFdlYkNvcmUv d21sL1dNTENhcmRFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3dtbC9XTUxDYXJk RWxlbWVudC5jcHAJKHJldmlzaW9uIDQ3MDQxKQorKysgV2ViQ29yZS93bWwvV01MQ2FyZEVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzksOCArMzM5LDYgQEAgV01MQ2FyZEVsZW1lbnQq IFdNTENhcmRFbGVtZW50OjpkZXRlcm1pbgogICAgIC8vIFVwZGF0ZSB0aGUgZG9jdW1lbnQgdGl0 bGUKICAgICBkb2MtPnNldFRpdGxlKGFjdGl2ZUNhcmQtPnRpdGxlKCkpOwogCi0gICAgLy8gU2V0 IHRoZSBhY3RpdmUgYWN0aXZlQ2FyZCBpbiB0aGUgV01MUGFnZVN0YXRlIG9iamVjdAotICAgIHBh Z2VTdGF0ZS0+c2V0QWN0aXZlQ2FyZChhY3RpdmVDYXJkKTsKICAgICByZXR1cm4gYWN0aXZlQ2Fy ZDsKIH0KIApJbmRleDogV2ViQ29yZS93bWwvV01MRG9FbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3dtbC9XTUxEb0VsZW1lbnQuY3BwCShyZXZpc2lvbiA0NzA0MSkKKysrIFdlYkNv cmUvd21sL1dNTERvRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyLDEyICs3MiwxNSBA QCB2b2lkIFdNTERvRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFCiAgICAgICAgIGlmICht X3Rhc2spCiAgICAgICAgICAgICBtX3Rhc2stPmV4ZWN1dGVUYXNrKGV2ZW50KTsKICAgICB9IGVs c2UgaWYgKG1fdHlwZSA9PSAicHJldiIpIHsKLSAgICAgICAgV01MUGFnZVN0YXRlKiBwYWdlU3Rh dGUgPSB3bWxQYWdlU3RhdGVGb3JEb2N1bWVudChkb2N1bWVudCgpKTsKKyAgICAgICAgQVNTRVJU KGRvY3VtZW50KCktPmlzV01MRG9jdW1lbnQoKSk7CisgICAgICAgIFdNTERvY3VtZW50KiBkb2N1 bWVudCA9IHN0YXRpY19jYXN0PFdNTERvY3VtZW50Kj4odGhpcy0+ZG9jdW1lbnQoKSk7CisKKyAg ICAgICAgV01MUGFnZVN0YXRlKiBwYWdlU3RhdGUgPSB3bWxQYWdlU3RhdGVGb3JEb2N1bWVudChk b2N1bWVudCk7CiAgICAgICAgIGlmICghcGFnZVN0YXRlKQogICAgICAgICAgICAgcmV0dXJuOwot CisgICAgCiAgICAgICAgIC8vIFN0b3AgdGhlIHRpbWVyIG9mIHRoZSBjdXJyZW50IGNhcmQgaWYg aXQgaXMgYWN0aXZlCi0gICAgICAgIGlmIChXTUxDYXJkRWxlbWVudCogY2FyZCA9IHBhZ2VTdGF0 ZS0+YWN0aXZlQ2FyZCgpKSB7CisgICAgICAgIGlmIChXTUxDYXJkRWxlbWVudCogY2FyZCA9IGRv Y3VtZW50LT5hY3RpdmVDYXJkKCkpIHsKICAgICAgICAgICAgIGlmIChXTUxUaW1lckVsZW1lbnQq IGV2ZW50VGltZXIgPSBjYXJkLT5ldmVudFRpbWVyKCkpCiAgICAgICAgICAgICAgICAgZXZlbnRU aW1lci0+c3RvcCgpOwogICAgICAgICB9CkluZGV4OiBXZWJDb3JlL3dtbC9XTUxEb2N1bWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS93bWwvV01MRG9jdW1lbnQuY3BwCShyZXZpc2lvbiA0 NzA0MSkKKysrIFdlYkNvcmUvd21sL1dNTERvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NzksMTAgKzc5LDggQEAgdm9pZCBXTUxEb2N1bWVudDo6ZmluaXNoZWRQYXJzaW5nKCkKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChtX2FjdGl2ZUNhcmQpIHsKKyAgICBpZiAobV9h Y3RpdmVDYXJkKQogICAgICAgICBtX2FjdGl2ZUNhcmQtPmhhbmRsZUludHJpbnNpY0V2ZW50SWZO ZWVkZWQoKTsKLSAgICAgICAgbV9hY3RpdmVDYXJkID0gMDsKLSAgICB9CiB9CiAKIGJvb2wgV01M RG9jdW1lbnQ6OmluaXRpYWxpemUoYm9vbCBhYm91dFRvRmluaXNoUGFyc2luZykKSW5kZXg6IFdl YkNvcmUvd21sL1dNTERvY3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS93bWwvV01MRG9j dW1lbnQuaAkocmV2aXNpb24gNDcwNDEpCisrKyBXZWJDb3JlL3dtbC9XTUxEb2N1bWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaW5pdGlh bGl6ZShib29sIGFib3V0VG9GaW5pc2hQYXJzaW5nID0gZmFsc2UpOwogCisgICAgV01MQ2FyZEVs ZW1lbnQqIGFjdGl2ZUNhcmQoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2ZUNhcmQ7IH0KKwogcHJp dmF0ZToKICAgICBXTUxEb2N1bWVudChGcmFtZSopOwogICAgIFdNTENhcmRFbGVtZW50KiBtX2Fj dGl2ZUNhcmQ7CkluZGV4OiBXZWJDb3JlL3dtbC9XTUxHb0VsZW1lbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvd21sL1dNTEdvRWxlbWVudC5jcHAJKHJldmlzaW9uIDQ3MDQxKQorKysgV2Vi Q29yZS93bWwvV01MR29FbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzUsMTYgKzc1LDE4 IEBAIHZvaWQgV01MR29FbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZSgKIAogdm9pZCBXTUxH b0VsZW1lbnQ6OmV4ZWN1dGVUYXNrKEV2ZW50KikKIHsKLSAgICBEb2N1bWVudCogZG9jID0gZG9j dW1lbnQoKTsKLSAgICBXTUxQYWdlU3RhdGUqIHBhZ2VTdGF0ZSA9IHdtbFBhZ2VTdGF0ZUZvckRv Y3VtZW50KGRvYyk7CisgICAgQVNTRVJUKGRvY3VtZW50KCktPmlzV01MRG9jdW1lbnQoKSk7Cisg ICAgV01MRG9jdW1lbnQqIGRvY3VtZW50ID0gc3RhdGljX2Nhc3Q8V01MRG9jdW1lbnQqPih0aGlz LT5kb2N1bWVudCgpKTsKKworICAgIFdNTFBhZ2VTdGF0ZSogcGFnZVN0YXRlID0gd21sUGFnZVN0 YXRlRm9yRG9jdW1lbnQoZG9jdW1lbnQpOwogICAgIGlmICghcGFnZVN0YXRlKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBXTUxDYXJkRWxlbWVudCogY2FyZCA9IHBhZ2VTdGF0ZS0+YWN0aXZlQ2Fy ZCgpOworICAgIFdNTENhcmRFbGVtZW50KiBjYXJkID0gZG9jdW1lbnQtPmFjdGl2ZUNhcmQoKTsK ICAgICBpZiAoIWNhcmQpCiAgICAgICAgIHJldHVybjsKIAotICAgIEZyYW1lKiBmcmFtZSA9IGRv Yy0+ZnJhbWUoKTsKKyAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKICAgICBp ZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47CiAKQEAgLTk3LDcgKzk5LDcgQEAgdm9pZCBXTUxH b0VsZW1lbnQ6OmV4ZWN1dGVUYXNrKEV2ZW50KikKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8g U3Vic3RpdHV0ZSB2YXJpYWJsZXMgd2l0aGluIHRhcmdldCB1cmwgYXR0cmlidXRlIHZhbHVlCi0g ICAgS1VSTCB1cmwgPSBkb2MtPmNvbXBsZXRlVVJMKHN1YnN0aXR1dGVWYXJpYWJsZVJlZmVyZW5j ZXMoaHJlZiwgZG9jLCBXTUxWYXJpYWJsZUVzY2FwaW5nRXNjYXBlKSk7CisgICAgS1VSTCB1cmwg PSBkb2N1bWVudC0+Y29tcGxldGVVUkwoc3Vic3RpdHV0ZVZhcmlhYmxlUmVmZXJlbmNlcyhocmVm LCBkb2N1bWVudCwgV01MVmFyaWFibGVFc2NhcGluZ0VzY2FwZSkpOwogICAgIGlmICh1cmwuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm47CiAKQEAgLTEwOCw5ICsxMTAsOSBAQCB2b2lkIFdNTEdv RWxlbWVudDo6ZXhlY3V0ZVRhc2soRXZlbnQqKQogICAgICAgICBldmVudFRpbWVyLT5zdG9wKCk7 CiAKICAgICAvLyBGSVhNRTogJ25ld2NvbnRleHQnIGhhbmRsaW5nIG5vdCBpbXBsZW1lbnRlZCBm b3IgZXh0ZXJuYWwgY2FyZHMKLSAgICBib29sIGluU2FtZURlY2sgPSBkb2MtPnVybCgpLnBhdGgo KSA9PSB1cmwucGF0aCgpOworICAgIGJvb2wgaW5TYW1lRGVjayA9IGRvY3VtZW50LT51cmwoKS5w YXRoKCkgPT0gdXJsLnBhdGgoKTsKICAgICBpZiAoaW5TYW1lRGVjayAmJiB1cmwuaGFzRnJhZ21l bnRJZGVudGlmaWVyKCkpIHsKLSAgICAgICAgaWYgKFdNTENhcmRFbGVtZW50KiBjYXJkID0gV01M Q2FyZEVsZW1lbnQ6OmZpbmROYW1lZENhcmRJbkRvY3VtZW50KGRvYywgdXJsLmZyYWdtZW50SWRl bnRpZmllcigpKSkgeworICAgICAgICBpZiAoV01MQ2FyZEVsZW1lbnQqIGNhcmQgPSBXTUxDYXJk RWxlbWVudDo6ZmluZE5hbWVkQ2FyZEluRG9jdW1lbnQoZG9jdW1lbnQsIHVybC5mcmFnbWVudElk ZW50aWZpZXIoKSkpIHsKICAgICAgICAgICAgIGlmIChjYXJkLT5pc05ld0NvbnRleHQoKSkKICAg ICAgICAgICAgICAgICBwYWdlU3RhdGUtPnJlc2V0KCk7CiAgICAgICAgIH0KSW5kZXg6IFdlYkNv cmUvd21sL1dNTFBhZ2VTdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS93bWwvV01MUGFn ZVN0YXRlLmNwcAkocmV2aXNpb24gNDcwNDEpCisrKyBXZWJDb3JlL3dtbC9XTUxQYWdlU3RhdGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogV01MUGFnZVN0YXRlOjpXTUxQYWdlU3RhdGUoUGFnZSogcGFnZSkKICAgICA6IG1fcGFnZShw YWdlKQotICAgICwgbV9hY3RpdmVDYXJkKDApCiAgICAgLCBtX2hhc0FjY2Vzc0NvbnRyb2xEYXRh KGZhbHNlKQogewogfQpJbmRleDogV2ViQ29yZS93bWwvV01MUGFnZVN0YXRlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS93bWwvV01MUGFnZVN0YXRlLmgJKHJldmlzaW9uIDQ3MDQxKQorKysgV2Vi Q29yZS93bWwvV01MUGFnZVN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDkgKzU0LDYgQEAg cHVibGljOgogCiAgICAgUGFnZSogcGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZTsgfQogCi0g ICAgV01MQ2FyZEVsZW1lbnQqIGFjdGl2ZUNhcmQoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2ZUNh cmQ7IH0KLSAgICB2b2lkIHNldEFjdGl2ZUNhcmQoV01MQ2FyZEVsZW1lbnQqIGNhcmQpIHsgbV9h Y3RpdmVDYXJkID0gY2FyZDsgfQotCiAgICAgLy8gRGVjayBhY2Nlc3MgY29udHJvbAogICAgIGJv b2wgcHJvY2Vzc0FjY2Vzc0NvbnRyb2xEYXRhKGNvbnN0IFN0cmluZyYgZG1haW4sIGNvbnN0IFN0 cmluZyYgcGF0aCk7CiAgICAgdm9pZCByZXNldEFjY2Vzc0NvbnRyb2xEYXRhKCk7CkBAIC03MCw3 ICs2Nyw2IEBAIHByaXZhdGU6CiBwcml2YXRlOgogICAgIFBhZ2UqIG1fcGFnZTsKICAgICBXTUxW YXJpYWJsZU1hcCBtX3ZhcmlhYmxlczsKLSAgICBXTUxDYXJkRWxlbWVudCogbV9hY3RpdmVDYXJk OwogICAgIFN0cmluZyBtX2FjY2Vzc0RvbWFpbjsKICAgICBTdHJpbmcgbV9hY2Nlc3NQYXRoOwog ICAgIGJvb2wgbV9oYXNBY2Nlc3NDb250cm9sRGF0YTsKSW5kZXg6IFdlYkNvcmUvd21sL1dNTFBy ZXZFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3dtbC9XTUxQcmV2RWxlbWVudC5j cHAJKHJldmlzaW9uIDQ3MDQxKQorKysgV2ViQ29yZS93bWwvV01MUHJldkVsZW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00MiwxMSArNDIsMTQgQEAgV01MUHJldkVsZW1lbnQ6On5XTUxQcmV2 RWxlbWVudCgpCiAKIHZvaWQgV01MUHJldkVsZW1lbnQ6OmV4ZWN1dGVUYXNrKEV2ZW50KikKIHsK LSAgICBXTUxQYWdlU3RhdGUqIHBhZ2VTdGF0ZSA9IHdtbFBhZ2VTdGF0ZUZvckRvY3VtZW50KGRv Y3VtZW50KCkpOworICAgIEFTU0VSVChkb2N1bWVudCgpLT5pc1dNTERvY3VtZW50KCkpOworICAg IFdNTERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PFdNTERvY3VtZW50Kj4odGhpcy0+ ZG9jdW1lbnQoKSk7CisKKyAgICBXTUxQYWdlU3RhdGUqIHBhZ2VTdGF0ZSA9IHdtbFBhZ2VTdGF0 ZUZvckRvY3VtZW50KGRvY3VtZW50KTsKICAgICBpZiAoIXBhZ2VTdGF0ZSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgV01MQ2FyZEVsZW1lbnQqIGNhcmQgPSBwYWdlU3RhdGUtPmFjdGl2ZUNhcmQo KTsKKyAgICBXTUxDYXJkRWxlbWVudCogY2FyZCA9IGRvY3VtZW50LT5hY3RpdmVDYXJkKCk7CiAg ICAgaWYgKCFjYXJkKQogICAgICAgICByZXR1cm47CiAKSW5kZXg6IFdlYkNvcmUvd21sL1dNTFJl ZnJlc2hFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3dtbC9XTUxSZWZyZXNoRWxl bWVudC5jcHAJKHJldmlzaW9uIDQ3MDQxKQorKysgV2ViQ29yZS93bWwvV01MUmVmcmVzaEVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MywxMSArNDMsMTQgQEAgV01MUmVmcmVzaEVsZW1l bnQ6On5XTUxSZWZyZXNoRWxlbWVudCgpCiAKIHZvaWQgV01MUmVmcmVzaEVsZW1lbnQ6OmV4ZWN1 dGVUYXNrKEV2ZW50KikKIHsKLSAgICBXTUxQYWdlU3RhdGUqIHBhZ2VTdGF0ZSA9IHdtbFBhZ2VT dGF0ZUZvckRvY3VtZW50KGRvY3VtZW50KCkpOworICAgIEFTU0VSVChkb2N1bWVudCgpLT5pc1dN TERvY3VtZW50KCkpOworICAgIFdNTERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PFdN TERvY3VtZW50Kj4odGhpcy0+ZG9jdW1lbnQoKSk7CisKKyAgICBXTUxQYWdlU3RhdGUqIHBhZ2VT dGF0ZSA9IHdtbFBhZ2VTdGF0ZUZvckRvY3VtZW50KGRvY3VtZW50KTsKICAgICBpZiAoIXBhZ2VT dGF0ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV01MQ2FyZEVsZW1lbnQqIGNhcmQgPSBwYWdl U3RhdGUtPmFjdGl2ZUNhcmQoKTsKKyAgICBXTUxDYXJkRWxlbWVudCogY2FyZCA9IGRvY3VtZW50 LT5hY3RpdmVDYXJkKCk7CiAgICAgaWYgKCFjYXJkKQogICAgICAgICByZXR1cm47CiAKQEAgLTYy LDcgKzY1LDcgQEAgdm9pZCBXTUxSZWZyZXNoRWxlbWVudDo6ZXhlY3V0ZVRhc2soRXZlbgogICAg IHN0b3JlVmFyaWFibGVTdGF0ZShwYWdlU3RhdGUpOwogCiAgICAgLy8gUmVkaXNwbGF5IGN1cnJl bXQgY2FyZCB3aXRoIGN1cnJlbnQgdmFyaWFibGUgc3RhdGUKLSAgICBpZiAoRnJhbWUqIGZyYW1l ID0gZG9jdW1lbnQoKS0+ZnJhbWUoKSkgeworICAgIGlmIChGcmFtZSogZnJhbWUgPSBkb2N1bWVu dC0+ZnJhbWUoKSkgewogICAgICAgICBpZiAoRnJhbWVMb2FkZXIqIGxvYWRlciA9IGZyYW1lLT5s b2FkZXIoKSkKICAgICAgICAgICAgIGxvYWRlci0+cmVsb2FkKCk7CiAgICAgfQ==