129524 2014-02-28 17:34:10 -0800 Web Inspector: debugger statements do not break 2014-03-03 14:07:55 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Mac OS X 10.9 RESOLVED FIXED InRadar P2 Major --- 1 jonowells mark.lam graouts joepeck jonowells mark.lam timothy webkit-bug-importer oldest_to_newest 985797 0 225512 jonowells 2014-02-28 17:34:10 -0800 Created attachment 225512 Web archive to reproduce the breakpoint bug. Breakpoints do not seem to work. `debugger;` statements are skipped entirely. Breakpoints inserted in the inspector pretty print editor will not break the execution in WebKit r164860. To reproduce for the debugger statement: 1. Open the attached breakpoint.webarchive 2. Open the web inspector 3. In the console, call: foo(). No breaking will occur. To reproduce manually: 1. Open the attached breakpoint.webarchive 2. Open the web inspector 3. Click on Resources and open main.js 4. Add a breakpoint inside foo() on line 3 (the variable assignment) 5. Refresh the page. 985799 1 webkit-bug-importer 2014-02-28 17:34:42 -0800 <rdar://problem/16202928> 986437 2 225678 mark.lam 2014-03-03 12:00:35 -0800 Created attachment 225678 debugger statement test case The previously attached test case has a bug where the function containing the debugger statement was never called. Here's a new one. 986443 3 225681 mark.lam 2014-03-03 12:15:16 -0800 Created attachment 225681 the patch: now supporting debugger statements. 986448 4 225681 mark.lam 2014-03-03 12:26:18 -0800 Comment on attachment 225681 the patch: now supporting debugger statements. This patch causes many unexpected inspector regressions. Looking into it. 986462 5 225685 mark.lam 2014-03-03 13:01:28 -0800 Created attachment 225685 patch 2 The previous patch has a union - struct tree that is a little too complex. The result is that the compiler ended up expressing the outermost union as a struct instead. In patch2, I flattened the union to only contain an unsigned and a struct. With this, the inspector tests are passing again. 986486 6 225685 ggaren 2014-03-03 13:56:56 -0800 Comment on attachment 225685 patch 2 r=me 986488 7 mark.lam 2014-03-03 14:07:55 -0800 Thanks. Landed in r165008: <http://trac.webkit.org/r165008>. 225512 2014-02-28 17:34:10 -0800 2014-03-03 12:00:35 -0800 Web archive to reproduce the breakpoint bug. breakpoint.webarchive application/x-webarchive 1662 jonowells YnBsaXN0MDDSAQIDDV8QD1dlYlN1YnJlc291cmNlc18QD1dlYk1haW5SZXNvdXJjZaEE1AUGBwgJ CgsMXldlYlJlc291cmNlVVJMXxATV2ViUmVzb3VyY2VSZXNwb25zZV8QD1dlYlJlc291cmNlRGF0 YV8QE1dlYlJlc291cmNlTUlNRVR5cGVfEBhodHRwOi8vbG9jYWxob3N0L21haW4uanNPEQRSYnBs aXN0MDDUAQIDBAUGZmdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QHwcI IigpMBsxMkpLTE1OT1BRUlNUVVZXWFlaW1xfYGFVJG51bGzdCQoLDA0ODxAREhMUFRYXGBkaGxwd Hh8XICFSJDZTJDEwUiQyUiQ3UiQzUyQxMVIkOFYkY2xhc3NSJDRSJDlSJDBSJDVSJDGABxAIEAeA CIACEACAHIAegAWAHYAGEAHTIxAkJSYnV05TLmJhc2VbTlMucmVsYXRpdmWAAIAEgANfEBhodHRw Oi8vbG9jYWxob3N0L21haW4uanPSKissLVokY2xhc3NuYW1lWCRjbGFzc2VzVU5TVVJMoi4vVU5T VVJMWE5TT2JqZWN0I0G4wXAw91ZDEMjTMzQQNT9JV05TLmtleXNaTlMub2JqZWN0c6k2Nzg5Ojs8 PT6ACYAKgAuADIANgA6AD4AQgBGpQEFCQ0RFRkdIgBKAE4AUgBWAFoAXgBiAGYAagBtWU2VydmVy XENvbnRlbnQtVHlwZVRFdGFnXUxhc3QtTW9kaWZpZWRURGF0ZV1BY2NlcHQtUmFuZ2VzXkNvbnRl bnQtTGVuZ3RoWktlZXAtQWxpdmVaQ29ubmVjdGlvbl8QOEFwYWNoZS8yLjIuMjYgKFVuaXgpIERB Vi8yIG1vZF9zc2wvMi4yLjI2IE9wZW5TU0wvMC45Ljh5XxAWYXBwbGljYXRpb24vamF2YXNjcmlw dF8QGSJmNzZiYTUtNTYtNGYzODE4NzJjNDljMCJfEB1TYXQsIDAxIE1hciAyMDE0IDAxOjMyOjMx IEdNVF8QHVNhdCwgMDEgTWFyIDIwMTQgMDE6MzI6MzIgR01UVWJ5dGVzUjg2XxARdGltZW91dD01 LCBtYXg9OTlaS2VlcC1BbGl2ZdIqK11eXE5TRGljdGlvbmFyeaJdLxBWXxAWYXBwbGljYXRpb24v amF2YXNjcmlwdNIqK2JjXxARTlNIVFRQVVJMUmVzcG9uc2WjZGUvXxARTlNIVFRQVVJMUmVzcG9u c2VdTlNVUkxSZXNwb25zZV8QD05TS2V5ZWRBcmNoaXZlctFoaV8QE1dlYlJlc291cmNlUmVzcG9u c2WAAQAIABEAGgAjAC0AMgA3AFkAXwB6AH0AgQCEAIcAigCOAJEAmACbAJ4AoQCkAKcAqQCrAK0A rwCxALMAtQC3ALkAuwC9AL8AxgDOANoA3ADeAOAA+wEAAQsBFAEaAR0BIwEsATUBNwE+AUYBUQFb AV0BXwFhAWMBZQFnAWkBawFtAXcBeQF7AX0BfwGBAYMBhQGHAYkBiwGSAZ8BpAGyAbcBxQHUAd8B 6gIlAj4CWgJ6ApoCoAKjArcCwgLHAtQC1wLZAvIC9wMLAw8DIwMxA0MDRgNcAAAAAAAAAgEAAAAA AAAAagAAAAAAAAAAAAAAAAAAA15PEFZmdW5jdGlvbiBmb28oKSB7CiAgICAvLyBTZXR0aW5nIGJy ZWFrcG9pbnQgc2hvdWxkIHdvcmsKICAgIHZhciB4ID0gMDsKICAgIGRlYnVnZ2VyOwp9Cl8QFmFw cGxpY2F0aW9uL2phdmFzY3JpcHTVBQcIDg8QERITFF8QG1dlYlJlc291cmNlVGV4dEVuY29kaW5n TmFtZV8QFFdlYlJlc291cmNlRnJhbWVOYW1lXxARaHR0cDovL2xvY2FsaG9zdC9PEGA8aHRtbD48 aGVhZD4KICAgICAgICA8c2NyaXB0IHNyYz0ibWFpbi5qcyI+PC9zY3JpcHQ+CiAgICA8L2hlYWQ+ CiAgICA8Ym9keT4KICAgIAoKPC9ib2R5PjwvaHRtbD5ZdGV4dC9odG1sVVVURi04UAAIAA0AHwAx ADMAPABLAGEAcwCJAKQE+gVTBWwFdwWVBawFwAYjBi0GMwAAAAAAAAIBAAAAAAAAABUAAAAAAAAA AAAAAAAAAAY0 225678 2014-03-03 12:00:35 -0800 2014-03-03 12:00:35 -0800 debugger statement test case debugger-statement-testcase.tgz application/x-gzip 290 mark.lam H4sIANDeFFMAA+3Uy1KDMBQG4K55ijOs2oU2IQQWUFa61WdIubRVLk4Ijo7juxuCdaPVDdOOM/+3 OTmQhGSSQ1Fuh92u1Fe9UaZsytZc701TL+bEGIvCkMYYR9JFFky5w0NJPBBMchlzERPjkQjkgtis qzhhsBvXdimN0o+1ak72s92q6pd5pq3QV/wn0vG0M48o3ZeqGBu22ef68GSo1/nGL75fkIfez9L1 1MkNXR/HptuueM3sAxc9+8LNfulNwkk/Hu/M3/iz/rn4rH8RCxnZ+pdxzFH/51ANbW4OXUtV1y1X 9OZ+AM9K0wttiCUuPd6RKVN1qc3Sv7m/u/VXiffueW5ogioHAAAAAAAAAAAAAAAAAAAAuIQP3Xo0 MAAoAAA= 225681 2014-03-03 12:15:16 -0800 2014-03-03 13:01:28 -0800 the patch: now supporting debugger statements. bug-129524.patch text/plain 10078 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0OTk2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDE0LTAzLTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBkZWJ1Z2dlciBzdGF0ZW1lbnRzIGRvIG5vdCBicmVhay4KKyAgICAgICAg PGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTUyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTaW5jZSB3ZSBubyBsb25nZXIgY2FsbCBvcF9kZWJ1ZyBo b29rcyB1bmxlc3MgdGhlcmUgaXMgYSBkZWJ1Z2dlciByZXF1ZXN0CisgICAgICAgIG1hZGUgb24g dGhlIENvZGVCbG9jaywgdGhlIG9wX2RlYnVnIGZvciB0aGUgZGVidWdnZXIgc3RhdGVtZW50IG5l dmVyIGdldHMKKyAgICAgICAgc2VydmljZWQuCisKKyAgICAgICAgV2l0aCB0aGlzIGZpeCwgd2Ug Y2hlY2sgaW4gdGhlIENvZGVCbG9jayBjb25zdHJ1Y3RvciBpZiBhbnkgZGVidWdnZXIKKyAgICAg ICAgc3RhdGVtZW50cyBhcmUgcHJlc2VudC4gIElmIHNvLCB3ZSBzZXQgYSBtX2hhc0RlYnVnZ2Vy U3RhdGVtZW50IGZsYWcgdGhhdAorICAgICAgICBjYXVzZXMgdGhlIENvZGVCbG9jayB0byBzaG93 IGFzIGhhdmluZyBkZWJ1Z2dlciByZXF1ZXN0cy4gIEhlbmNlLAorICAgICAgICBicmVha2luZyBh dCBkZWJ1Z2dlciBzdGF0ZW1lbnRzIGlzIG5vdyByZXN0b3JlZC4KKworICAgICAgICAqIGJ5dGVj b2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6Q29kZUJsb2NrKToK KyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2Nr OjpoYXNEZWJ1Z2dlclJlcXVlc3RzKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpyZWFkT25s eURlYnVnZ2VyUmVxdWVzdHNBZGRyZXNzKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpjbGVh ckRlYnVnZ2VyUmVxdWVzdHMpOgorICAgICAgICAqIGppdC9KSVRPcGNvZGVzLmNwcDoKKyAgICAg ICAgKEpTQzo6SklUOjplbWl0X29wX2RlYnVnKToKKyAgICAgICAgKiBqaXQvSklUT3Bjb2RlczMy XzY0LmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2RlYnVnKToKKyAgICAgICAgKiBs bGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbToKKwogMjAxNC0wMy0wMyAgQnJpYW4gQnVyZyAg PGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBBbm90aGVyIHVucmV2aWV3ZWQgYnVpbGQgZml4 IGF0dGVtcHQgZm9yIFdpbmRvd3MgYWZ0ZXIgcjE2NDk4Ni4KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCShyZXZpc2lvbiAxNjQ5NzEpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTQyMCw2ICsxNDIwLDcgQEAgQ29kZUJsb2NrOjpDb2RlQmxvY2soQ29weVBhcnNlZEJs b2NrVGFnLAogICAgICwgbV9kaWRGYWlsRlRMQ29tcGlsYXRpb24oZmFsc2UpCiAgICAgLCBtX2hh c0JlZW5Db21waWxlZFdpdGhGVEwoZmFsc2UpCiAgICAgLCBtX3VubGlua2VkQ29kZSgqb3RoZXIu bV92bSwgb3RoZXIubV9vd25lckV4ZWN1dGFibGUuZ2V0KCksIG90aGVyLm1fdW5saW5rZWRDb2Rl LmdldCgpKQorICAgICwgbV9oYXNEZWJ1Z2dlclN0YXRlbWVudChmYWxzZSkKICAgICAsIG1fc3Rl cHBpbmdNb2RlKFN0ZXBwaW5nTW9kZURpc2FibGVkKQogICAgICwgbV9udW1CcmVha3BvaW50cygw KQogICAgICwgbV9vd25lckV4ZWN1dGFibGUoKm90aGVyLm1fdm0sIG90aGVyLm1fb3duZXJFeGVj dXRhYmxlLmdldCgpLCBvdGhlci5tX293bmVyRXhlY3V0YWJsZS5nZXQoKSkKQEAgLTE0NzcsNiAr MTQ3OCw3IEBAIENvZGVCbG9jazo6Q29kZUJsb2NrKFNjcmlwdEV4ZWN1dGFibGUqIG8KICAgICAs IG1fZGlkRmFpbEZUTENvbXBpbGF0aW9uKGZhbHNlKQogICAgICwgbV9oYXNCZWVuQ29tcGlsZWRX aXRoRlRMKGZhbHNlKQogICAgICwgbV91bmxpbmtlZENvZGUobV9nbG9iYWxPYmplY3QtPnZtKCks IG93bmVyRXhlY3V0YWJsZSwgdW5saW5rZWRDb2RlQmxvY2spCisgICAgLCBtX2hhc0RlYnVnZ2Vy U3RhdGVtZW50KGZhbHNlKQogICAgICwgbV9zdGVwcGluZ01vZGUoU3RlcHBpbmdNb2RlRGlzYWJs ZWQpCiAgICAgLCBtX251bUJyZWFrcG9pbnRzKDApCiAgICAgLCBtX293bmVyRXhlY3V0YWJsZSht X2dsb2JhbE9iamVjdC0+dm0oKSwgb3duZXJFeGVjdXRhYmxlLCBvd25lckV4ZWN1dGFibGUpCkBA IC0xNzc5LDYgKzE3ODEsMTIgQEAgQ29kZUJsb2NrOjpDb2RlQmxvY2soU2NyaXB0RXhlY3V0YWJs ZSogbwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAorICAgICAgICBjYXNlIG9wX2Rl YnVnOiB7CisgICAgICAgICAgICBpZiAocGNbMV0udS5pbmRleCA9PSBEaWRSZWFjaEJyZWFrcG9p bnQpCisgICAgICAgICAgICAgICAgbV9oYXNEZWJ1Z2dlclN0YXRlbWVudCA9IHRydWU7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorCiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0NvZGVCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9Db2RlQmxvY2suaAkocmV2aXNpb24gMTY0OTcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0NvZGVCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC04NzcsOCArODc3LDggQEAg cHVibGljOgogCiAgICAgYm9vbCBoYXNPcERlYnVnRm9yTGluZUFuZENvbHVtbih1bnNpZ25lZCBs aW5lLCB1bnNpZ25lZCBjb2x1bW4pOwogCi0gICAgYm9vbCBoYXNEZWJ1Z2dlclJlcXVlc3RzKCkg Y29uc3QgeyByZXR1cm4gISFtX2RlYnVnZ2VyUmVxdWVzdHM7IH0KLSAgICB2b2lkKiBkZWJ1Z2dl clJlcXVlc3RzQWRkcmVzcygpIHsgcmV0dXJuICZtX2RlYnVnZ2VyUmVxdWVzdHM7IH0KKyAgICBi b29sIGhhc0RlYnVnZ2VyUmVxdWVzdHMoKSBjb25zdCB7IHJldHVybiBtX3JlYWRPbmx5RGVidWdn ZXJSZXF1ZXN0czsgfQorICAgIHZvaWQqIHJlYWRPbmx5RGVidWdnZXJSZXF1ZXN0c0FkZHJlc3Mo KSB7IHJldHVybiAmbV9yZWFkT25seURlYnVnZ2VyUmVxdWVzdHM7IH0KIAogICAgIHZvaWQgYWRk QnJlYWtwb2ludCh1bnNpZ25lZCBudW1CcmVha3BvaW50cyk7CiAgICAgdm9pZCByZW1vdmVCcmVh a3BvaW50KHVuc2lnbmVkIG51bUJyZWFrcG9pbnRzKQpAQCAtODkzLDcgKzg5Myw3IEBAIHB1Ymxp YzoKICAgICB9OwogICAgIHZvaWQgc2V0U3RlcHBpbmdNb2RlKFN0ZXBwaW5nTW9kZSk7CiAKLSAg ICB2b2lkIGNsZWFyRGVidWdnZXJSZXF1ZXN0cygpIHsgbV9kZWJ1Z2dlclJlcXVlc3RzID0gMDsg fQorICAgIHZvaWQgY2xlYXJEZWJ1Z2dlclJlcXVlc3RzKCkgeyBtX2NsZWFyYWJsZURlYnVnZ2Vy UmVxdWVzdHMgPSAwOyB9CiAgICAgCiAgICAgLy8gRklYTUU6IE1ha2UgdGhlc2UgcmVtYWluaW5n IG1lbWJlcnMgcHJpdmF0ZS4KIApAQCAtMTAyNSwxMCArMTAyNSwxNiBAQCBwcml2YXRlOgogICAg IFdyaXRlQmFycmllcjxVbmxpbmtlZENvZGVCbG9jaz4gbV91bmxpbmtlZENvZGU7CiAgICAgaW50 IG1fbnVtUGFyYW1ldGVyczsKICAgICB1bmlvbiB7Ci0gICAgICAgIHVuc2lnbmVkIG1fZGVidWdn ZXJSZXF1ZXN0czsKKyAgICAgICAgdW5zaWduZWQgbV9yZWFkT25seURlYnVnZ2VyUmVxdWVzdHM7 CiAgICAgICAgIHN0cnVjdCB7Ci0gICAgICAgICAgICB1bnNpZ25lZCBtX3N0ZXBwaW5nTW9kZSA6 IDE7Ci0gICAgICAgICAgICB1bnNpZ25lZCBtX251bUJyZWFrcG9pbnRzIDogMzE7CisgICAgICAg ICAgICB1bnNpZ25lZCBtX2hhc0RlYnVnZ2VyU3RhdGVtZW50IDogMTsKKyAgICAgICAgICAgIHVu aW9uIHsKKyAgICAgICAgICAgICAgICB1bnNpZ25lZCBtX2NsZWFyYWJsZURlYnVnZ2VyUmVxdWVz dHMgOiAzMTsKKyAgICAgICAgICAgICAgICBzdHJ1Y3QgeworICAgICAgICAgICAgICAgICAgICB1 bnNpZ25lZCBtX3N0ZXBwaW5nTW9kZSA6IDE7CisgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVk IG1fbnVtQnJlYWtwb2ludHMgOiAzMDsKKyAgICAgICAgICAgICAgICB9OworICAgICAgICAgICAg fTsKICAgICAgICAgfTsKICAgICB9OwogICAgIFdyaXRlQmFycmllcjxTY3JpcHRFeGVjdXRhYmxl PiBtX293bmVyRXhlY3V0YWJsZTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU T3Bjb2RlczMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0pJVE9wY29kZXMzMl82NC5jcHAJKHJldmlzaW9uIDE2NDk3MSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTc5LDcg Kzk3OSw3IEBAIHZvaWQgSklUOjplbWl0X29wX3Rocm93X3N0YXRpY19lcnJvcihJbnMKIAogdm9p ZCBKSVQ6OmVtaXRfb3BfZGVidWcoSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIHsK LSAgICBsb2FkMzIoY29kZUJsb2NrKCktPmRlYnVnZ2VyUmVxdWVzdHNBZGRyZXNzKCksIHJlZ1Qw KTsKKyAgICBsb2FkMzIoY29kZUJsb2NrKCktPnJlYWRPbmx5RGVidWdnZXJSZXF1ZXN0c0FkZHJl c3MoKSwgcmVnVDApOwogICAgIEp1bXAgbm9EZWJ1Z2dlclJlcXVlc3RzID0gYnJhbmNoVGVzdDMy KFplcm8sIHJlZ1QwKTsKICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbkRlYnVnLCBjdXJyZW50 SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kKTsKICAgICBub0RlYnVnZ2VyUmVxdWVzdHMubGluayh0 aGlzKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkocmV2 aXNpb24gMTY0OTcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjkyLDcgKzY5Miw3IEBAIHZvaWQgSklUOjplbWl0X29wX3Ro cm93X3N0YXRpY19lcnJvcihJbnMKIAogdm9pZCBKSVQ6OmVtaXRfb3BfZGVidWcoSW5zdHJ1Y3Rp b24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIHsKLSAgICBsb2FkMzIoY29kZUJsb2NrKCktPmRlYnVn Z2VyUmVxdWVzdHNBZGRyZXNzKCksIHJlZ1QwKTsKKyAgICBsb2FkMzIoY29kZUJsb2NrKCktPnJl YWRPbmx5RGVidWdnZXJSZXF1ZXN0c0FkZHJlc3MoKSwgcmVnVDApOwogICAgIEp1bXAgbm9EZWJ1 Z2dlclJlcXVlc3RzID0gYnJhbmNoVGVzdDMyKFplcm8sIHJlZ1QwKTsKICAgICBjYWxsT3BlcmF0 aW9uKG9wZXJhdGlvbkRlYnVnLCBjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kKTsKICAg ICBub0RlYnVnZ2VyUmVxdWVzdHMubGluayh0aGlzKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20JKHJldmlzaW9uIDE2 NDk3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVy LmFzbQkod29ya2luZyBjb3B5KQpAQCAtMTEwOSw3ICsxMTA5LDcgQEAgX2xsaW50X29wX3Byb2Zp bGVfZGlkX2NhbGw6CiBfbGxpbnRfb3BfZGVidWc6CiAgICAgdHJhY2VFeGVjdXRpb24oKQogICAg IGxvYWRwIENvZGVCbG9ja1tjZnJdLCB0MAotICAgIGxvYWRpIENvZGVCbG9jazo6bV9kZWJ1Z2dl clJlcXVlc3RzW3QwXSwgdDAKKyAgICBsb2FkaSBDb2RlQmxvY2s6Om1fcmVhZE9ubHlEZWJ1Z2dl clJlcXVlc3RzW3QwXSwgdDAKICAgICBidGl6IHQwLCAub3BEZWJ1Z0RvbmUKICAgICBjYWxsU2xv d1BhdGgoX2xsaW50X3Nsb3dfcGF0aF9kZWJ1ZykKIC5vcERlYnVnRG9uZTogICAgICAgICAgICAg ICAgICAgIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY0OTk2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDMtMDMgIE1hcmsgTGFt ICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRlYnVnZ2Vy IHN0YXRlbWVudHMgZG8gbm90IGJyZWFrLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2Iv MTI5NTI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogaW5zcGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL2RlYnVnZ2VyLXN0YXRlbWVudC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9kZWJ1 Z2dlci1zdGF0ZW1lbnQuaHRtbDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yLXByb3RvY29s L2RlYnVnZ2VyL3Jlc291cmNlcy9icmVha3BvaW50LmpzOgorICAgICAgICAoZGVidWdnZXJTdGF0 ZW1lbnQpOgorCiAyMDE0LTAzLTAzICBEaXJrIFNjaHVsemUgIDxrcml0QHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVHJhbnNmb3JtIENTUyBjbGlwLXBhdGggcGl4ZWwgdGVzdHMgdG8gcmVmIHRlc3Rz CkluZGV4OiBMYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9jb2wvZGVidWdnZXIvZGVidWdnZXIt c3RhdGVtZW50LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9pbnNwZWN0 b3ItcHJvdG9jb2wvZGVidWdnZXIvZGVidWdnZXItc3RhdGVtZW50LWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9kZWJ1 Z2dlci1zdGF0ZW1lbnQtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsOSBA QAorRGVidWdnZXIgc3RhdGVtZW50IHNob3VsZCBicmVhayBpbiBkZWJ1Z2dlci4KKworRm91bmQg YnJlYWtwb2ludC5qcworSW4gZnVuY3Rpb24gd2l0aCBkZWJ1Z2dlciBzdGF0ZW1lbnQKK0Jyb2tl IGF0IGRlYnVnZ2VyIHN0YXRlbWVudAorCitBZnRlciBkZWJ1Z2dlciBzdGF0ZW1lbnQKK1BBU1MK KwpJbmRleDogTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL2RlYnVnZ2Vy LXN0YXRlbWVudC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2luc3BlY3Rvci1wcm90 b2NvbC9kZWJ1Z2dlci9kZWJ1Z2dlci1zdGF0ZW1lbnQuaHRtbAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9kZWJ1Z2dlci1zdGF0ZW1lbnQu aHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDQ2IEBACis8aHRtbD4KKzxoZWFkPgorPHNj cmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL3Jlc291cmNlcy9w cm90b2NvbC10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvYnJlYWtw b2ludC5qcyI+PC9zY3JpcHQ+CisKKzxzY3JpcHQ+CisvLyBQdXQgdGhpcyBoZXJlIGluc3RlYWQg b2Ygb24gPGJvZHkgb25sb2FkPiB0byBwcmV2ZW50IGFuIGV4dHJhIERlYnVnZ2VyLnNjcmlwdFBh cnNlZCBldmVudC4KK3dpbmRvdy5vbmxvYWQgPSBydW5UZXN0OworCitmdW5jdGlvbiB0ZXN0KCkK K3sKKyAgICAvLyBUaGlzIHRlc3Qgc2V0dGluZyAyIGJyZWFrcG9pbnRzIGluIERGRyBjb21waWxl ZCBmdW5jdGlvbnM6IG9uZSBpbmxpbmVkLAorICAgIC8vIGFuZCBvbmUgbm90IGlubGluZWQuCisK KyAgICBJbnNwZWN0b3JUZXN0LnNlbmRDb21tYW5kKCJEZWJ1Z2dlci5lbmFibGUiLCB7fSk7CisK KyAgICB2YXIgYnJlYWtwb2ludEZvdW5kID0gZmFsc2U7CisKKyAgICBJbnNwZWN0b3JUZXN0LmV2 ZW50SGFuZGxlclsiRGVidWdnZXIuc2NyaXB0UGFyc2VkIl0gPSBmdW5jdGlvbihtZXNzYWdlT2Jq ZWN0KQorICAgIHsKKyAgICAgICAgaWYgKC9yZXNvdXJjZXNcL2JyZWFrcG9pbnRcLmpzJC8udGVz dChtZXNzYWdlT2JqZWN0LnBhcmFtcy51cmwpKSB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmxvZygiRm91bmQgYnJlYWtwb2ludC5qcyIpOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LnNlbmRDb21tYW5kKCJSdW50aW1lLmV2YWx1YXRlIiwgeworICAgICAgICAgICAgICAgIGV4cHJl c3Npb246ICJkZWJ1Z2dlclN0YXRlbWVudCgpOyIKKyAgICAgICAgICAgIH0sIGZ1bmN0aW9uKHJl c3BvbnNlT2JqZWN0KSB7CisgICAgICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnRGb3VuZCkKKyAg ICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIlBBU1MiKTsKKyAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOworICAgICAgICAgICAgfSk7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICBJbnNwZWN0b3JUZXN0LmV2ZW50SGFuZGxlclsiRGVidWdnZXIu cGF1c2VkIl0gPSBmdW5jdGlvbihtZXNzYWdlT2JqZWN0KQorICAgIHsKKyAgICAgICAgSW5zcGVj dG9yVGVzdC5sb2coIkJyb2tlIGF0IGRlYnVnZ2VyIHN0YXRlbWVudFxuIik7CisgICAgICAgIGJy ZWFrcG9pbnRGb3VuZCA9IHRydWU7CisgICAgICAgIEluc3BlY3RvclRlc3Quc2VuZENvbW1hbmQo IkRlYnVnZ2VyLnJlc3VtZSIsIHt9KTsKKyAgICB9Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorPHA+RGVidWdnZXIgc3RhdGVtZW50IHNob3VsZCBicmVhayBpbiBkZWJ1Z2dlci48L3A+ Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9jb2wv ZGVidWdnZXIvcmVzb3VyY2VzL2JyZWFrcG9pbnQuanMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvaW5zcGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL3Jlc291cmNlcy9icmVha3BvaW50LmpzCShy ZXZpc2lvbiAxNjQ5NzEpCisrKyBMYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9jb2wvZGVidWdn ZXIvcmVzb3VyY2VzL2JyZWFrcG9pbnQuanMJKHdvcmtpbmcgY29weSkKQEAgLTgyLDMgKzgyLDEy IEBAIGZ1bmN0aW9uIGNhbGxOb3RJbmxpbmVhYmxlMigpCiAgICAgZWxzZQogICAgICAgICBsb2co IkZBSUw6IHJlc3VsdCBpcyAiICsgcmVzdWx0ICsgIiwgZXhwZWN0aW5nIDIwMDAzIik7CiB9CisK K2Z1bmN0aW9uIGRlYnVnZ2VyU3RhdGVtZW50KHgpCit7CisgICAgbG9nKCJJbiBmdW5jdGlvbiB3 aXRoIGRlYnVnZ2VyIHN0YXRlbWVudCIpOworICAgIGRlYnVnZ2VyOworICAgIGxvZygiQWZ0ZXIg ZGVidWdnZXIgc3RhdGVtZW50Iik7CisgICAgcmV0dXJuIHggKyAzOworfQorCg== 225685 2014-03-03 13:01:28 -0800 2014-03-03 13:56:55 -0800 patch 2 bug-129524.patch text/plain 7482 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1MDAxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE0LTAzLTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBkZWJ1Z2dlciBzdGF0ZW1lbnRzIGRvIG5vdCBicmVhay4KKyAgICAgICAg PGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTUyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTaW5jZSB3ZSBubyBsb25nZXIgY2FsbCBvcF9kZWJ1ZyBo b29rcyB1bmxlc3MgdGhlcmUgaXMgYSBkZWJ1Z2dlciByZXF1ZXN0CisgICAgICAgIG1hZGUgb24g dGhlIENvZGVCbG9jaywgdGhlIG9wX2RlYnVnIGZvciB0aGUgZGVidWdnZXIgc3RhdGVtZW50IG5l dmVyIGdldHMKKyAgICAgICAgc2VydmljZWQuCisKKyAgICAgICAgV2l0aCB0aGlzIGZpeCwgd2Ug Y2hlY2sgaW4gdGhlIENvZGVCbG9jayBjb25zdHJ1Y3RvciBpZiBhbnkgZGVidWdnZXIKKyAgICAg ICAgc3RhdGVtZW50cyBhcmUgcHJlc2VudC4gIElmIHNvLCB3ZSBzZXQgYSBtX2hhc0RlYnVnZ2Vy U3RhdGVtZW50IGZsYWcgdGhhdAorICAgICAgICBjYXVzZXMgdGhlIENvZGVCbG9jayB0byBzaG93 IGFzIGhhdmluZyBkZWJ1Z2dlciByZXF1ZXN0cy4gIEhlbmNlLAorICAgICAgICBicmVha2luZyBh dCBkZWJ1Z2dlciBzdGF0ZW1lbnRzIGlzIG5vdyByZXN0b3JlZC4KKworICAgICAgICAqIGJ5dGVj b2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6Q29kZUJsb2NrKToK KyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxvY2suaDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2Nr OjpoYXNEZWJ1Z2dlclJlcXVlc3RzKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpjbGVhckRl YnVnZ2VyUmVxdWVzdHMpOgorCiAyMDE0LTAzLTAzICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUu Y29tPgogCiAgICAgICAgIEFub3RoZXIgdW5yZXZpZXdlZCBidWlsZCBmaXggYXR0ZW1wdCBmb3Ig V2luZG93cyBhZnRlciByMTY0OTg2LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE2NDk3MSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDIwLDYg KzE0MjAsNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhDb3B5UGFyc2VkQmxvY2tUYWcsCiAgICAg LCBtX2RpZEZhaWxGVExDb21waWxhdGlvbihmYWxzZSkKICAgICAsIG1faGFzQmVlbkNvbXBpbGVk V2l0aEZUTChmYWxzZSkKICAgICAsIG1fdW5saW5rZWRDb2RlKCpvdGhlci5tX3ZtLCBvdGhlci5t X293bmVyRXhlY3V0YWJsZS5nZXQoKSwgb3RoZXIubV91bmxpbmtlZENvZGUuZ2V0KCkpCisgICAg LCBtX2hhc0RlYnVnZ2VyU3RhdGVtZW50KGZhbHNlKQogICAgICwgbV9zdGVwcGluZ01vZGUoU3Rl cHBpbmdNb2RlRGlzYWJsZWQpCiAgICAgLCBtX251bUJyZWFrcG9pbnRzKDApCiAgICAgLCBtX293 bmVyRXhlY3V0YWJsZSgqb3RoZXIubV92bSwgb3RoZXIubV9vd25lckV4ZWN1dGFibGUuZ2V0KCks IG90aGVyLm1fb3duZXJFeGVjdXRhYmxlLmdldCgpKQpAQCAtMTQ3Nyw2ICsxNDc4LDcgQEAgQ29k ZUJsb2NrOjpDb2RlQmxvY2soU2NyaXB0RXhlY3V0YWJsZSogbwogICAgICwgbV9kaWRGYWlsRlRM Q29tcGlsYXRpb24oZmFsc2UpCiAgICAgLCBtX2hhc0JlZW5Db21waWxlZFdpdGhGVEwoZmFsc2Up CiAgICAgLCBtX3VubGlua2VkQ29kZShtX2dsb2JhbE9iamVjdC0+dm0oKSwgb3duZXJFeGVjdXRh YmxlLCB1bmxpbmtlZENvZGVCbG9jaykKKyAgICAsIG1faGFzRGVidWdnZXJTdGF0ZW1lbnQoZmFs c2UpCiAgICAgLCBtX3N0ZXBwaW5nTW9kZShTdGVwcGluZ01vZGVEaXNhYmxlZCkKICAgICAsIG1f bnVtQnJlYWtwb2ludHMoMCkKICAgICAsIG1fb3duZXJFeGVjdXRhYmxlKG1fZ2xvYmFsT2JqZWN0 LT52bSgpLCBvd25lckV4ZWN1dGFibGUsIG93bmVyRXhlY3V0YWJsZSkKQEAgLTE3NzksNiArMTc4 MSwxMiBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhTY3JpcHRFeGVjdXRhYmxlKiBvCiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQogCisgICAgICAgIGNhc2Ugb3BfZGVidWc6IHsKKyAgICAg ICAgICAgIGlmIChwY1sxXS51LmluZGV4ID09IERpZFJlYWNoQnJlYWtwb2ludCkKKyAgICAgICAg ICAgICAgICBtX2hhc0RlYnVnZ2VyU3RhdGVtZW50ID0gdHJ1ZTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CisKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5o CShyZXZpc2lvbiAxNjQ5NzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29k ZUJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTg3Nyw3ICs4NzcsNyBAQCBwdWJsaWM6CiAKICAg ICBib29sIGhhc09wRGVidWdGb3JMaW5lQW5kQ29sdW1uKHVuc2lnbmVkIGxpbmUsIHVuc2lnbmVk IGNvbHVtbik7CiAKLSAgICBib29sIGhhc0RlYnVnZ2VyUmVxdWVzdHMoKSBjb25zdCB7IHJldHVy biAhIW1fZGVidWdnZXJSZXF1ZXN0czsgfQorICAgIGJvb2wgaGFzRGVidWdnZXJSZXF1ZXN0cygp IGNvbnN0IHsgcmV0dXJuIG1fZGVidWdnZXJSZXF1ZXN0czsgfQogICAgIHZvaWQqIGRlYnVnZ2Vy UmVxdWVzdHNBZGRyZXNzKCkgeyByZXR1cm4gJm1fZGVidWdnZXJSZXF1ZXN0czsgfQogCiAgICAg dm9pZCBhZGRCcmVha3BvaW50KHVuc2lnbmVkIG51bUJyZWFrcG9pbnRzKTsKQEAgLTg5Myw3ICs4 OTMsMTEgQEAgcHVibGljOgogICAgIH07CiAgICAgdm9pZCBzZXRTdGVwcGluZ01vZGUoU3RlcHBp bmdNb2RlKTsKIAotICAgIHZvaWQgY2xlYXJEZWJ1Z2dlclJlcXVlc3RzKCkgeyBtX2RlYnVnZ2Vy UmVxdWVzdHMgPSAwOyB9CisgICAgdm9pZCBjbGVhckRlYnVnZ2VyUmVxdWVzdHMoKQorICAgIHsK KyAgICAgICAgbV9zdGVwcGluZ01vZGUgPSBTdGVwcGluZ01vZGVEaXNhYmxlZDsKKyAgICAgICAg bV9udW1CcmVha3BvaW50cyA9IDA7CisgICAgfQogICAgIAogICAgIC8vIEZJWE1FOiBNYWtlIHRo ZXNlIHJlbWFpbmluZyBtZW1iZXJzIHByaXZhdGUuCiAKQEAgLTEwMjcsOCArMTAzMSw5IEBAIHBy aXZhdGU6CiAgICAgdW5pb24gewogICAgICAgICB1bnNpZ25lZCBtX2RlYnVnZ2VyUmVxdWVzdHM7 CiAgICAgICAgIHN0cnVjdCB7CisgICAgICAgICAgICB1bnNpZ25lZCBtX2hhc0RlYnVnZ2VyU3Rh dGVtZW50IDogMTsKICAgICAgICAgICAgIHVuc2lnbmVkIG1fc3RlcHBpbmdNb2RlIDogMTsKLSAg ICAgICAgICAgIHVuc2lnbmVkIG1fbnVtQnJlYWtwb2ludHMgOiAzMTsKKyAgICAgICAgICAgIHVu c2lnbmVkIG1fbnVtQnJlYWtwb2ludHMgOiAzMDsKICAgICAgICAgfTsKICAgICB9OwogICAgIFdy aXRlQmFycmllcjxTY3JpcHRFeGVjdXRhYmxlPiBtX293bmVyRXhlY3V0YWJsZTsKSW5kZXg6IExh eW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDE2NTAwMSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAzLTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxl LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkZWJ1Z2dlciBzdGF0ZW1lbnRzIGRvIG5v dCBicmVhay4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTUyND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci1wcm90 b2NvbC9kZWJ1Z2dlci9kZWJ1Z2dlci1zdGF0ZW1lbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBpbnNwZWN0b3ItcHJvdG9jb2wvZGVidWdnZXIvZGVidWdnZXItc3RhdGVtZW50Lmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9yZXNvdXJj ZXMvYnJlYWtwb2ludC5qczoKKyAgICAgICAgKGRlYnVnZ2VyU3RhdGVtZW50KToKKwogMjAxNC0w My0wMyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbTVNFXSBZ b3VUdWJlIHZpZGVvcyBmYWlsIHRvIHBsYXkKSW5kZXg6IExheW91dFRlc3RzL2luc3BlY3Rvci1w cm90b2NvbC9kZWJ1Z2dlci9kZWJ1Z2dlci1zdGF0ZW1lbnQtZXhwZWN0ZWQudHh0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9kZWJ1Z2dlci1z dGF0ZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaW5zcGVj dG9yLXByb3RvY29sL2RlYnVnZ2VyL2RlYnVnZ2VyLXN0YXRlbWVudC1leHBlY3RlZC50eHQJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSw5IEBACitEZWJ1Z2dlciBzdGF0ZW1lbnQgc2hvdWxkIGJy ZWFrIGluIGRlYnVnZ2VyLgorCitGb3VuZCBicmVha3BvaW50LmpzCitJbiBmdW5jdGlvbiB3aXRo IGRlYnVnZ2VyIHN0YXRlbWVudAorQnJva2UgYXQgZGVidWdnZXIgc3RhdGVtZW50CisKK0FmdGVy IGRlYnVnZ2VyIHN0YXRlbWVudAorUEFTUworCkluZGV4OiBMYXlvdXRUZXN0cy9pbnNwZWN0b3It cHJvdG9jb2wvZGVidWdnZXIvZGVidWdnZXItc3RhdGVtZW50Lmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL2RlYnVnZ2VyLXN0YXRlbWVu dC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2Rl YnVnZ2VyL2RlYnVnZ2VyLXN0YXRlbWVudC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEs NDYgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNw ZWN0b3ItcHJvdG9jb2wvcmVzb3VyY2VzL3Byb3RvY29sLXRlc3QuanMiPjwvc2NyaXB0PgorPHNj cmlwdCBzcmM9InJlc291cmNlcy9icmVha3BvaW50LmpzIj48L3NjcmlwdD4KKworPHNjcmlwdD4K Ky8vIFB1dCB0aGlzIGhlcmUgaW5zdGVhZCBvZiBvbiA8Ym9keSBvbmxvYWQ+IHRvIHByZXZlbnQg YW4gZXh0cmEgRGVidWdnZXIuc2NyaXB0UGFyc2VkIGV2ZW50Lgord2luZG93Lm9ubG9hZCA9IHJ1 blRlc3Q7CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIC8vIFRoaXMgdGVzdCBzZXR0aW5nIDIg YnJlYWtwb2ludHMgaW4gREZHIGNvbXBpbGVkIGZ1bmN0aW9uczogb25lIGlubGluZWQsCisgICAg Ly8gYW5kIG9uZSBub3QgaW5saW5lZC4KKworICAgIEluc3BlY3RvclRlc3Quc2VuZENvbW1hbmQo IkRlYnVnZ2VyLmVuYWJsZSIsIHt9KTsKKworICAgIHZhciBicmVha3BvaW50Rm91bmQgPSBmYWxz ZTsKKworICAgIEluc3BlY3RvclRlc3QuZXZlbnRIYW5kbGVyWyJEZWJ1Z2dlci5zY3JpcHRQYXJz ZWQiXSA9IGZ1bmN0aW9uKG1lc3NhZ2VPYmplY3QpCisgICAgeworICAgICAgICBpZiAoL3Jlc291 cmNlc1wvYnJlYWtwb2ludFwuanMkLy50ZXN0KG1lc3NhZ2VPYmplY3QucGFyYW1zLnVybCkpIHsK KyAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJGb3VuZCBicmVha3BvaW50LmpzIik7CisK KyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2VuZENvbW1hbmQoIlJ1bnRpbWUuZXZhbHVhdGUi LCB7CisgICAgICAgICAgICAgICAgZXhwcmVzc2lvbjogImRlYnVnZ2VyU3RhdGVtZW50KCk7Igor ICAgICAgICAgICAgfSwgZnVuY3Rpb24ocmVzcG9uc2VPYmplY3QpIHsKKyAgICAgICAgICAgICAg ICBpZiAoYnJlYWtwb2ludEZvdW5kKQorICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmxvZygiUEFTUyIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVUZXN0 KCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0KKworICAgIEluc3BlY3RvclRl c3QuZXZlbnRIYW5kbGVyWyJEZWJ1Z2dlci5wYXVzZWQiXSA9IGZ1bmN0aW9uKG1lc3NhZ2VPYmpl Y3QpCisgICAgeworICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiQnJva2UgYXQgZGVidWdnZXIg c3RhdGVtZW50XG4iKTsKKyAgICAgICAgYnJlYWtwb2ludEZvdW5kID0gdHJ1ZTsKKyAgICAgICAg SW5zcGVjdG9yVGVzdC5zZW5kQ29tbWFuZCgiRGVidWdnZXIucmVzdW1lIiwge30pOworICAgIH0K K30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cD5EZWJ1Z2dlciBzdGF0ZW1lbnQgc2hv dWxkIGJyZWFrIGluIGRlYnVnZ2VyLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91 dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9yZXNvdXJjZXMvYnJlYWtwb2ludC5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9jb2wvZGVidWdnZXIv cmVzb3VyY2VzL2JyZWFrcG9pbnQuanMJKHJldmlzaW9uIDE2NDk3MSkKKysrIExheW91dFRlc3Rz L2luc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9yZXNvdXJjZXMvYnJlYWtwb2ludC5qcwkod29y a2luZyBjb3B5KQpAQCAtODIsMyArODIsMTIgQEAgZnVuY3Rpb24gY2FsbE5vdElubGluZWFibGUy KCkKICAgICBlbHNlCiAgICAgICAgIGxvZygiRkFJTDogcmVzdWx0IGlzICIgKyByZXN1bHQgKyAi LCBleHBlY3RpbmcgMjAwMDMiKTsKIH0KKworZnVuY3Rpb24gZGVidWdnZXJTdGF0ZW1lbnQoeCkK K3sKKyAgICBsb2coIkluIGZ1bmN0aW9uIHdpdGggZGVidWdnZXIgc3RhdGVtZW50Iik7CisgICAg ZGVidWdnZXI7CisgICAgbG9nKCJBZnRlciBkZWJ1Z2dlciBzdGF0ZW1lbnQiKTsKKyAgICByZXR1 cm4geCArIDM7Cit9CisK