129516 2014-02-28 16:35:57 -0800 [iOS][WebKit2] Don't use any of the mach exception handling code on iOS 2014-03-01 09:07:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psolanki psolanki andersca commit-queue ossy psolanki oldest_to_newest 985767 0 psolanki 2014-02-28 16:35:57 -0800 [iOS][WebKit2] Don't use any of the mach exception handling code on iOS 985771 1 225504 psolanki 2014-02-28 16:38:41 -0800 Created attachment 225504 Patch 985774 2 psolanki 2014-02-28 16:41:32 -0800 I could have used #if PLATFORM(MAC) but didn't think having a PLATFORM(MAC) inside a file named Mac.cpp made sense. So I used !PLATFORM(IOS). 985779 3 225508 psolanki 2014-02-28 16:44:54 -0800 Created attachment 225508 Patch 985832 4 225508 commit-queue 2014-02-28 20:04:52 -0800 Comment on attachment 225508 Patch Clearing flags on attachment: 225508 Committed r164905: <http://trac.webkit.org/changeset/164905> 985833 5 commit-queue 2014-02-28 20:04:57 -0800 All reviewed patches have been landed. Closing bug. 985899 6 225508 ossy 2014-03-01 00:32:22 -0800 Comment on attachment 225508 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225508&action=review > Source/WebKit2/Shared/ChildProcessProxy.cpp:131 > -#if PLATFORM(MAC) > +#if !PLATFORM(IOS) It broke the EFL and GTK build. PLATFORM(MAC) was the proper guard here, because only Apple Mac port has/use this function. But !PLATFORM(IOS) includes all ports (Apple Mac, GTK, EFL) except IOS. 985900 7 ossy 2014-03-01 00:34:53 -0800 Buildfix landed in http://trac.webkit.org/changeset/164912 Otherwise I think using !PLATFORM(IOS) instead of PLATFORM(MAC) anywhere is so serious and misleading if you don't want to intentionally refer all ports except IOS. 985901 8 ossy 2014-03-01 00:40:00 -0800 (In reply to comment #2) > I could have used #if PLATFORM(MAC) but didn't think having a PLATFORM(MAC) inside a file named Mac.cpp made sense. So I used !PLATFORM(IOS). PLATFORM(MAC) == Apple Mac port PLATFORM(IOS) == Apple IOS port !PLATFORM(IOS) == all ports except Apple IOS port, which is Apple Mac port if you use it in a *Mac.cpp. But it isn't true in platform independent files. 985927 9 psolanki 2014-03-01 09:00:52 -0800 Oops. Do you want to just roll the patch out? I am not near a computer right now. 985930 10 psolanki 2014-03-01 09:07:02 -0800 Oh I see you landed a build fix. Thank you! 225504 2014-02-28 16:38:41 -0800 2014-02-28 16:44:53 -0800 Patch bug-129516-20140228163841.patch text/plain 6030 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTFjZjA3ZjZiMDY4YWQ0 MmQzMzRkYTc0ZjQ2NTJjYzdkYTdiMWE1NC4uMmZiZGU1N2FlMjU3ZDY4ODk2ODBhODE1N2Q5YWFh NmQ1YmJmNGQxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTAyLTI4ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KIAorICAgICAgICBbaU9TXVtXZWJLaXQy XSBEb24ndCB1c2UgYW55IG9mIHRoZSBtYWNoIGV4Y2VwdGlvbiBoYW5kbGluZyBjb2RlIG9uIGlP UworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NTE2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBj b2RlIGlzIG5vdCB1c2VkIG9uIGlPUyBhZnRlciBteSBmaXggaW4gcjE2NDg4My4gV2UgY2FuIGp1 c3QgbW92ZSBpdCBhbGwgdW5kZXIKKyAgICAgICAgIVBMQVRGT1JNKElPUykuCisKKyAgICAgICAg KiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oOgorICAgICAgICAqIFBsYXRmb3JtL0lQQy9tYWMv Q29ubmVjdGlvbk1hYy5jcHA6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OnBsYXRmb3JtSW52 YWxpZGF0ZSk6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OnBsYXRmb3JtSW5pdGlhbGl6ZSk6 CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246Om9wZW4pOgorICAgICAgICAqIFNoYXJlZC9DaGls ZFByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNoaWxkUHJvY2Vzc1Byb3h5Ojpk aWRGaW5pc2hMYXVuY2hpbmcpOgorCisyMDE0LTAyLTI4ICBQcmF0aWsgU29sYW5raSAgPHBzb2xh bmtpQGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9TXVtXZWJLaXQyXSBEb24ndCBncmFiIG1hY2gg ZXhjZXB0aW9uIHBvcnQgb24gaU9TCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjk1MDUKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1OTcyNzQ5Pgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaCBiL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKaW5kZXggNTdhMDUxMzUyODgy NzI5MTIxNTU0MmVhMjc2YTgyM2NjYTFjZGUxNS4uNTUwYTU4YzY4Nzc5YzQxZjIxM2VjZTNmMjg5 YTY1ZjE1M2IxNDEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nv bm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5o CkBAIC0xMzMsNyArMTMzLDcgQEAgcHVibGljOgogCiAgICAgQ2xpZW50KiBjbGllbnQoKSBjb25z dCB7IHJldHVybiBtX2NsaWVudDsgfQogCi0jaWYgT1MoREFSV0lOKQorI2lmICFQTEFURk9STShJ T1MpCiAgICAgdm9pZCBzZXRTaG91bGRDbG9zZUNvbm5lY3Rpb25Pbk1hY2hFeGNlcHRpb25zKCk7 CiAjZW5kaWYKIApAQCAtMjgzLDcgKzI4Myw2IEBAIHByaXZhdGU6CiAgICAgLy8gQ2FsbGVkIG9u IHRoZSBjb25uZWN0aW9uIHF1ZXVlLgogICAgIHZvaWQgcmVjZWl2ZVNvdXJjZUV2ZW50SGFuZGxl cigpOwogICAgIHZvaWQgaW5pdGlhbGl6ZURlYWROYW1lU291cmNlKCk7Ci0gICAgdm9pZCBleGNl cHRpb25Tb3VyY2VFdmVudEhhbmRsZXIoKTsKIAogICAgIG1hY2hfcG9ydF90IG1fc2VuZFBvcnQ7 CiAgICAgZGlzcGF0Y2hfc291cmNlX3QgbV9kZWFkTmFtZVNvdXJjZTsKQEAgLTI5MSwxMCArMjkw LDE0IEBAIHByaXZhdGU6CiAgICAgbWFjaF9wb3J0X3QgbV9yZWNlaXZlUG9ydDsKICAgICBkaXNw YXRjaF9zb3VyY2VfdCBtX3JlY2VpdmVQb3J0RGF0YUF2YWlsYWJsZVNvdXJjZTsKIAorI2lmICFQ TEFURk9STShJT1MpCisgICAgdm9pZCBleGNlcHRpb25Tb3VyY2VFdmVudEhhbmRsZXIoKTsKKwog ICAgIC8vIElmIHNldFNob3VsZENsb3NlQ29ubmVjdGlvbk9uTWFjaEV4Y2VwdGlvbnMgaGFzIGJl ZW4gY2FsbGVkLCB0aGlzIGhhcwogICAgIC8vIHRoZSBleGNlcHRpb24gcG9ydCB0aGF0IGV4Y2Vw dGlvbnMgZnJvbSB0aGUgb3RoZXIgZW5kIHdpbGwgYmUgc2VudCBvbi4KICAgICBtYWNoX3BvcnRf dCBtX2V4Y2VwdGlvblBvcnQ7CiAgICAgZGlzcGF0Y2hfc291cmNlX3QgbV9leGNlcHRpb25Qb3J0 RGF0YUF2YWlsYWJsZVNvdXJjZTsKKyNlbmRpZgogCiAgICAgeHBjX2Nvbm5lY3Rpb25fdCBtX3hw Y0Nvbm5lY3Rpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9t YWMvQ29ubmVjdGlvbk1hYy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvbWFjL0Nv bm5lY3Rpb25NYWMuY3BwCmluZGV4IGZlYTJhZjI5ODNmOTRjYzA1YzM3NDMxMWY5OTlhZjY3ODVi NTliNTIuLjE1Njg1ZTgxODA3NjhmM2ZiZDA5YjYzMThlYjc1ZTVkMmY2ZDIyZTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9tYWMvQ29ubmVjdGlvbk1hYy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL21hYy9Db25uZWN0aW9uTWFjLmNwcApAQCAt NjUsMTIgKzY1LDE0IEBAIHZvaWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKICAg ICBtX3JlY2VpdmVQb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSA9IDA7CiAgICAgbV9yZWNlaXZlUG9y dCA9IE1BQ0hfUE9SVF9OVUxMOwogCisjaWYgIVBMQVRGT1JNKElPUykKICAgICBpZiAobV9leGNl cHRpb25Qb3J0KSB7CiAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5jZWwobV9leGNlcHRpb25Q b3J0RGF0YUF2YWlsYWJsZVNvdXJjZSk7CiAgICAgICAgIGRpc3BhdGNoX3JlbGVhc2UobV9leGNl cHRpb25Qb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSk7CiAgICAgICAgIG1fZXhjZXB0aW9uUG9ydERh dGFBdmFpbGFibGVTb3VyY2UgPSAwOwogICAgICAgICBtX2V4Y2VwdGlvblBvcnQgPSBNQUNIX1BP UlRfTlVMTDsKICAgICB9CisjZW5kaWYKIAogICAgIGlmIChtX3hwY0Nvbm5lY3Rpb24pIHsKICAg ICAgICAgeHBjX3JlbGVhc2UobV94cGNDb25uZWN0aW9uKTsKQEAgLTgwLDcgKzgyLDEwIEBAIHZv aWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKIAogdm9pZCBDb25uZWN0aW9uOjpw bGF0Zm9ybUluaXRpYWxpemUoSWRlbnRpZmllciBpZGVudGlmaWVyKQogeworI2lmICFQTEFURk9S TShJT1MpCiAgICAgbV9leGNlcHRpb25Qb3J0ID0gTUFDSF9QT1JUX05VTEw7CisgICAgbV9leGNl cHRpb25Qb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSA9IG51bGxwdHI7CisjZW5kaWYKIAogICAgIGlm IChtX2lzU2VydmVyKSB7CiAgICAgICAgIG1fcmVjZWl2ZVBvcnQgPSBpZGVudGlmaWVyLnBvcnQ7 CkBAIC05Miw3ICs5Nyw2IEBAIHZvaWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1Jbml0aWFsaXplKElk ZW50aWZpZXIgaWRlbnRpZmllcikKIAogICAgIG1fZGVhZE5hbWVTb3VyY2UgPSBudWxscHRyOwog ICAgIG1fcmVjZWl2ZVBvcnREYXRhQXZhaWxhYmxlU291cmNlID0gbnVsbHB0cjsKLSAgICBtX2V4 Y2VwdGlvblBvcnREYXRhQXZhaWxhYmxlU291cmNlID0gbnVsbHB0cjsKIAogICAgIG1feHBjQ29u bmVjdGlvbiA9IGlkZW50aWZpZXIueHBjQ29ubmVjdGlvbjsKICAgICAvLyBGSVhNRTogSW5zdGVh ZCBvZiBleHBsaWNpdGx5IHJldGFpbmluZyB0aGUgY29ubmVjdGlvbiBoZXJlLCBJZGVudGlmaWVy Ojp4cGNDb25uZWN0aW9uCkBAIC0xNDksNiArMTUzLDcgQEAgYm9vbCBDb25uZWN0aW9uOjpvcGVu KCkKICAgICAvLyBSZWdpc3RlciB0aGUgZGF0YSBhdmFpbGFibGUgaGFuZGxlci4KICAgICBtX3Jl Y2VpdmVQb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSA9IGNyZWF0ZURhdGFBdmFpbGFibGVTb3VyY2Uo bV9yZWNlaXZlUG9ydCwgbV9jb25uZWN0aW9uUXVldWUuZ2V0KCksIGJpbmQoJkNvbm5lY3Rpb246 OnJlY2VpdmVTb3VyY2VFdmVudEhhbmRsZXIsIHRoaXMpKTsKIAorI2lmICFQTEFURk9STShJT1Mp CiAgICAgLy8gSWYgd2UgaGF2ZSBhbiBleGNlcHRpb24gcG9ydCwgcmVnaXN0ZXIgdGhlIGRhdGEg YXZhaWxhYmxlIGhhbmRsZXIgYW5kIHNlbmQgb3ZlciB0aGUgcG9ydCB0byB0aGUgb3RoZXIgZW5k LgogICAgIGlmIChtX2V4Y2VwdGlvblBvcnQpIHsKICAgICAgICAgbV9leGNlcHRpb25Qb3J0RGF0 YUF2YWlsYWJsZVNvdXJjZSA9IGNyZWF0ZURhdGFBdmFpbGFibGVTb3VyY2UobV9leGNlcHRpb25Q b3J0LCBtX2Nvbm5lY3Rpb25RdWV1ZS5nZXQoKSwgYmluZCgmQ29ubmVjdGlvbjo6ZXhjZXB0aW9u U291cmNlRXZlbnRIYW5kbGVyLCB0aGlzKSk7CkBAIC0xNTgsNiArMTYzLDcgQEAgYm9vbCBDb25u ZWN0aW9uOjpvcGVuKCkKIAogICAgICAgICBzZW5kTWVzc2FnZShzdGQ6Om1vdmUoZW5jb2Rlcikp OwogICAgIH0KKyNlbmRpZgogCiAgICAgcmVmKCk7CiAgICAgZGlzcGF0Y2hfYXN5bmMobV9jb25u ZWN0aW9uUXVldWUtPmRpc3BhdGNoUXVldWUoKSwgXnsKQEAgLTE2NSw4ICsxNzEsMTAgQEAgYm9v bCBDb25uZWN0aW9uOjpvcGVuKCkKIAogICAgICAgICBpZiAobV9kZWFkTmFtZVNvdXJjZSkKICAg ICAgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShtX2RlYWROYW1lU291cmNlKTsKKyNpZiAhUExBVEZP Uk0oSU9TKQogICAgICAgICBpZiAobV9leGNlcHRpb25Qb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSkK ICAgICAgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShtX2V4Y2VwdGlvblBvcnREYXRhQXZhaWxhYmxl U291cmNlKTsKKyNlbmRpZgogCiAgICAgICAgIGRlcmVmKCk7CiAgICAgfSk7CkBAIC00NDksNiAr NDU3LDcgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWNlaXZlU291cmNlRXZlbnRIYW5kbGVyKCkKICAg ICBwcm9jZXNzSW5jb21pbmdNZXNzYWdlKHN0ZDo6bW92ZShkZWNvZGVyKSk7CiB9ICAgIAogCisj aWYgIVBMQVRGT1JNKElPUykKIHZvaWQgQ29ubmVjdGlvbjo6ZXhjZXB0aW9uU291cmNlRXZlbnRI YW5kbGVyKCkKIHsKICAgICBSZWNlaXZlQnVmZmVyIGJ1ZmZlcjsKQEAgLTQ5Myw1ICs1MDIsNiBA QCB2b2lkIENvbm5lY3Rpb246OnNldFNob3VsZENsb3NlQ29ubmVjdGlvbk9uTWFjaEV4Y2VwdGlv bnMoKQogICAgIGlmIChtYWNoX3BvcnRfaW5zZXJ0X3JpZ2h0KG1hY2hfdGFza19zZWxmKCksIG1f ZXhjZXB0aW9uUG9ydCwgbV9leGNlcHRpb25Qb3J0LCBNQUNIX01TR19UWVBFX01BS0VfU0VORCkg IT0gS0VSTl9TVUNDRVNTKQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KKyNlbmRp ZgogCiB9IC8vIG5hbWVzcGFjZSBJUEMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9DaGlsZFByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9j ZXNzUHJveHkuY3BwCmluZGV4IGEyMjMxZTJkZWQzZjk4M2IxYjJlZWEzNDg4MTEwNzk3YmYwNDRm OGYuLjU4ODdjNTczNzE4MmQyMWU5MmFhM2NkMWE4ZWMxZTI3OGM0NzA5ZWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTI4LDcgKzEyOCw3IEBA IHZvaWQgQ2hpbGRQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNo ZXIqLCBJUEM6OkNvbm5lY3Rpb246OklkCiAgICAgQVNTRVJUKCFtX2Nvbm5lY3Rpb24pOwogCiAg ICAgbV9jb25uZWN0aW9uID0gSVBDOjpDb25uZWN0aW9uOjpjcmVhdGVTZXJ2ZXJDb25uZWN0aW9u KGNvbm5lY3Rpb25JZGVudGlmaWVyLCB0aGlzLCBSdW5Mb29wOjptYWluKCkpOwotI2lmIFBMQVRG T1JNKE1BQykKKyNpZiAhUExBVEZPUk0oSU9TKQogICAgIG1fY29ubmVjdGlvbi0+c2V0U2hvdWxk Q2xvc2VDb25uZWN0aW9uT25NYWNoRXhjZXB0aW9ucygpOwogI2VuZGlmCiAK 225508 2014-02-28 16:44:54 -0800 2014-03-01 00:32:22 -0800 Patch bug-129516-20140228164454.patch text/plain 6483 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTFjZjA3ZjZiMDY4YWQ0 MmQzMzRkYTc0ZjQ2NTJjYzdkYTdiMWE1NC4uMmZiZGU1N2FlMjU3ZDY4ODk2ODBhODE1N2Q5YWFh NmQ1YmJmNGQxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTAyLTI4ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KIAorICAgICAgICBbaU9TXVtXZWJLaXQy XSBEb24ndCB1c2UgYW55IG9mIHRoZSBtYWNoIGV4Y2VwdGlvbiBoYW5kbGluZyBjb2RlIG9uIGlP UworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NTE2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBj b2RlIGlzIG5vdCB1c2VkIG9uIGlPUyBhZnRlciBteSBmaXggaW4gcjE2NDg4My4gV2UgY2FuIGp1 c3QgbW92ZSBpdCBhbGwgdW5kZXIKKyAgICAgICAgIVBMQVRGT1JNKElPUykuCisKKyAgICAgICAg KiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oOgorICAgICAgICAqIFBsYXRmb3JtL0lQQy9tYWMv Q29ubmVjdGlvbk1hYy5jcHA6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OnBsYXRmb3JtSW52 YWxpZGF0ZSk6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OnBsYXRmb3JtSW5pdGlhbGl6ZSk6 CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246Om9wZW4pOgorICAgICAgICAqIFNoYXJlZC9DaGls ZFByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNoaWxkUHJvY2Vzc1Byb3h5Ojpk aWRGaW5pc2hMYXVuY2hpbmcpOgorCisyMDE0LTAyLTI4ICBQcmF0aWsgU29sYW5raSAgPHBzb2xh bmtpQGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9TXVtXZWJLaXQyXSBEb24ndCBncmFiIG1hY2gg ZXhjZXB0aW9uIHBvcnQgb24gaU9TCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjk1MDUKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1OTcyNzQ5Pgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaCBiL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKaW5kZXggNTdhMDUxMzUyODgy NzI5MTIxNTU0MmVhMjc2YTgyM2NjYTFjZGUxNS4uNTUwYTU4YzY4Nzc5YzQxZjIxM2VjZTNmMjg5 YTY1ZjE1M2IxNDEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nv bm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5o CkBAIC0xMzMsNyArMTMzLDcgQEAgcHVibGljOgogCiAgICAgQ2xpZW50KiBjbGllbnQoKSBjb25z dCB7IHJldHVybiBtX2NsaWVudDsgfQogCi0jaWYgT1MoREFSV0lOKQorI2lmICFQTEFURk9STShJ T1MpCiAgICAgdm9pZCBzZXRTaG91bGRDbG9zZUNvbm5lY3Rpb25Pbk1hY2hFeGNlcHRpb25zKCk7 CiAjZW5kaWYKIApAQCAtMjgzLDcgKzI4Myw2IEBAIHByaXZhdGU6CiAgICAgLy8gQ2FsbGVkIG9u IHRoZSBjb25uZWN0aW9uIHF1ZXVlLgogICAgIHZvaWQgcmVjZWl2ZVNvdXJjZUV2ZW50SGFuZGxl cigpOwogICAgIHZvaWQgaW5pdGlhbGl6ZURlYWROYW1lU291cmNlKCk7Ci0gICAgdm9pZCBleGNl cHRpb25Tb3VyY2VFdmVudEhhbmRsZXIoKTsKIAogICAgIG1hY2hfcG9ydF90IG1fc2VuZFBvcnQ7 CiAgICAgZGlzcGF0Y2hfc291cmNlX3QgbV9kZWFkTmFtZVNvdXJjZTsKQEAgLTI5MSwxMCArMjkw LDE0IEBAIHByaXZhdGU6CiAgICAgbWFjaF9wb3J0X3QgbV9yZWNlaXZlUG9ydDsKICAgICBkaXNw YXRjaF9zb3VyY2VfdCBtX3JlY2VpdmVQb3J0RGF0YUF2YWlsYWJsZVNvdXJjZTsKIAorI2lmICFQ TEFURk9STShJT1MpCisgICAgdm9pZCBleGNlcHRpb25Tb3VyY2VFdmVudEhhbmRsZXIoKTsKKwog ICAgIC8vIElmIHNldFNob3VsZENsb3NlQ29ubmVjdGlvbk9uTWFjaEV4Y2VwdGlvbnMgaGFzIGJl ZW4gY2FsbGVkLCB0aGlzIGhhcwogICAgIC8vIHRoZSBleGNlcHRpb24gcG9ydCB0aGF0IGV4Y2Vw dGlvbnMgZnJvbSB0aGUgb3RoZXIgZW5kIHdpbGwgYmUgc2VudCBvbi4KICAgICBtYWNoX3BvcnRf dCBtX2V4Y2VwdGlvblBvcnQ7CiAgICAgZGlzcGF0Y2hfc291cmNlX3QgbV9leGNlcHRpb25Qb3J0 RGF0YUF2YWlsYWJsZVNvdXJjZTsKKyNlbmRpZgogCiAgICAgeHBjX2Nvbm5lY3Rpb25fdCBtX3hw Y0Nvbm5lY3Rpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9t YWMvQ29ubmVjdGlvbk1hYy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvbWFjL0Nv bm5lY3Rpb25NYWMuY3BwCmluZGV4IGZlYTJhZjI5ODNmOTRjYzA1YzM3NDMxMWY5OTlhZjY3ODVi NTliNTIuLmE3ODExMjE4Nzc5MDIyYzM1N2NmYjQxZGIxZThhNTY1MmI5ZGM3MzAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9tYWMvQ29ubmVjdGlvbk1hYy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL21hYy9Db25uZWN0aW9uTWFjLmNwcApAQCAt NjUsMTIgKzY1LDE0IEBAIHZvaWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKICAg ICBtX3JlY2VpdmVQb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSA9IDA7CiAgICAgbV9yZWNlaXZlUG9y dCA9IE1BQ0hfUE9SVF9OVUxMOwogCisjaWYgIVBMQVRGT1JNKElPUykKICAgICBpZiAobV9leGNl cHRpb25Qb3J0KSB7CiAgICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5jZWwobV9leGNlcHRpb25Q b3J0RGF0YUF2YWlsYWJsZVNvdXJjZSk7CiAgICAgICAgIGRpc3BhdGNoX3JlbGVhc2UobV9leGNl cHRpb25Qb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSk7CiAgICAgICAgIG1fZXhjZXB0aW9uUG9ydERh dGFBdmFpbGFibGVTb3VyY2UgPSAwOwogICAgICAgICBtX2V4Y2VwdGlvblBvcnQgPSBNQUNIX1BP UlRfTlVMTDsKICAgICB9CisjZW5kaWYKIAogICAgIGlmIChtX3hwY0Nvbm5lY3Rpb24pIHsKICAg ICAgICAgeHBjX3JlbGVhc2UobV94cGNDb25uZWN0aW9uKTsKQEAgLTgwLDcgKzgyLDEwIEBAIHZv aWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKIAogdm9pZCBDb25uZWN0aW9uOjpw bGF0Zm9ybUluaXRpYWxpemUoSWRlbnRpZmllciBpZGVudGlmaWVyKQogeworI2lmICFQTEFURk9S TShJT1MpCiAgICAgbV9leGNlcHRpb25Qb3J0ID0gTUFDSF9QT1JUX05VTEw7CisgICAgbV9leGNl cHRpb25Qb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSA9IG51bGxwdHI7CisjZW5kaWYKIAogICAgIGlm IChtX2lzU2VydmVyKSB7CiAgICAgICAgIG1fcmVjZWl2ZVBvcnQgPSBpZGVudGlmaWVyLnBvcnQ7 CkBAIC05Miw3ICs5Nyw2IEBAIHZvaWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1Jbml0aWFsaXplKElk ZW50aWZpZXIgaWRlbnRpZmllcikKIAogICAgIG1fZGVhZE5hbWVTb3VyY2UgPSBudWxscHRyOwog ICAgIG1fcmVjZWl2ZVBvcnREYXRhQXZhaWxhYmxlU291cmNlID0gbnVsbHB0cjsKLSAgICBtX2V4 Y2VwdGlvblBvcnREYXRhQXZhaWxhYmxlU291cmNlID0gbnVsbHB0cjsKIAogICAgIG1feHBjQ29u bmVjdGlvbiA9IGlkZW50aWZpZXIueHBjQ29ubmVjdGlvbjsKICAgICAvLyBGSVhNRTogSW5zdGVh ZCBvZiBleHBsaWNpdGx5IHJldGFpbmluZyB0aGUgY29ubmVjdGlvbiBoZXJlLCBJZGVudGlmaWVy Ojp4cGNDb25uZWN0aW9uCkBAIC0xNDksNiArMTUzLDcgQEAgYm9vbCBDb25uZWN0aW9uOjpvcGVu KCkKICAgICAvLyBSZWdpc3RlciB0aGUgZGF0YSBhdmFpbGFibGUgaGFuZGxlci4KICAgICBtX3Jl Y2VpdmVQb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSA9IGNyZWF0ZURhdGFBdmFpbGFibGVTb3VyY2Uo bV9yZWNlaXZlUG9ydCwgbV9jb25uZWN0aW9uUXVldWUuZ2V0KCksIGJpbmQoJkNvbm5lY3Rpb246 OnJlY2VpdmVTb3VyY2VFdmVudEhhbmRsZXIsIHRoaXMpKTsKIAorI2lmICFQTEFURk9STShJT1Mp CiAgICAgLy8gSWYgd2UgaGF2ZSBhbiBleGNlcHRpb24gcG9ydCwgcmVnaXN0ZXIgdGhlIGRhdGEg YXZhaWxhYmxlIGhhbmRsZXIgYW5kIHNlbmQgb3ZlciB0aGUgcG9ydCB0byB0aGUgb3RoZXIgZW5k LgogICAgIGlmIChtX2V4Y2VwdGlvblBvcnQpIHsKICAgICAgICAgbV9leGNlcHRpb25Qb3J0RGF0 YUF2YWlsYWJsZVNvdXJjZSA9IGNyZWF0ZURhdGFBdmFpbGFibGVTb3VyY2UobV9leGNlcHRpb25Q b3J0LCBtX2Nvbm5lY3Rpb25RdWV1ZS5nZXQoKSwgYmluZCgmQ29ubmVjdGlvbjo6ZXhjZXB0aW9u U291cmNlRXZlbnRIYW5kbGVyLCB0aGlzKSk7CkBAIC0xNTgsNiArMTYzLDcgQEAgYm9vbCBDb25u ZWN0aW9uOjpvcGVuKCkKIAogICAgICAgICBzZW5kTWVzc2FnZShzdGQ6Om1vdmUoZW5jb2Rlcikp OwogICAgIH0KKyNlbmRpZgogCiAgICAgcmVmKCk7CiAgICAgZGlzcGF0Y2hfYXN5bmMobV9jb25u ZWN0aW9uUXVldWUtPmRpc3BhdGNoUXVldWUoKSwgXnsKQEAgLTE2NSw4ICsxNzEsMTAgQEAgYm9v bCBDb25uZWN0aW9uOjpvcGVuKCkKIAogICAgICAgICBpZiAobV9kZWFkTmFtZVNvdXJjZSkKICAg ICAgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShtX2RlYWROYW1lU291cmNlKTsKKyNpZiAhUExBVEZP Uk0oSU9TKQogICAgICAgICBpZiAobV9leGNlcHRpb25Qb3J0RGF0YUF2YWlsYWJsZVNvdXJjZSkK ICAgICAgICAgICAgIGRpc3BhdGNoX3Jlc3VtZShtX2V4Y2VwdGlvblBvcnREYXRhQXZhaWxhYmxl U291cmNlKTsKKyNlbmRpZgogCiAgICAgICAgIGRlcmVmKCk7CiAgICAgfSk7CkBAIC00MzIsNiAr NDQwLDcgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWNlaXZlU291cmNlRXZlbnRIYW5kbGVyKCkKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAorI2lmICFQTEFURk9STShJT1MpCiAgICAgaWYgKGRlY29k ZXItPm1lc3NhZ2VSZWNlaXZlck5hbWUoKSA9PSAiSVBDIiAmJiBkZWNvZGVyLT5tZXNzYWdlTmFt ZSgpID09ICJTZXRFeGNlcHRpb25Qb3J0IikgewogICAgICAgICBpZiAobV9pc1NlcnZlcikgewog ICAgICAgICAgICAgLy8gU2VydmVyIGNvbm5lY3Rpb25zIGFyZW4ndCBzdXBwb3NlZCB0byBoYXZl IHRoZWlyIGV4Y2VwdGlvbiBwb3J0cyBvdmVycmlkZW4uIFRyZWF0IHRoaXMgYXMgYW4gaW52YWxp ZCBtZXNzYWdlLgpAQCAtNDQ1LDEwICs0NTQsMTIgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWNlaXZl U291cmNlRXZlbnRIYW5kbGVyKCkKICAgICAgICAgc2V0TWFjaEV4Y2VwdGlvblBvcnQoZXhjZXB0 aW9uUG9ydC5wb3J0KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQorI2VuZGlmCiAKICAgICBw cm9jZXNzSW5jb21pbmdNZXNzYWdlKHN0ZDo6bW92ZShkZWNvZGVyKSk7CiB9ICAgIAogCisjaWYg IVBMQVRGT1JNKElPUykKIHZvaWQgQ29ubmVjdGlvbjo6ZXhjZXB0aW9uU291cmNlRXZlbnRIYW5k bGVyKCkKIHsKICAgICBSZWNlaXZlQnVmZmVyIGJ1ZmZlcjsKQEAgLTQ5Myw1ICs1MDQsNiBAQCB2 b2lkIENvbm5lY3Rpb246OnNldFNob3VsZENsb3NlQ29ubmVjdGlvbk9uTWFjaEV4Y2VwdGlvbnMo KQogICAgIGlmIChtYWNoX3BvcnRfaW5zZXJ0X3JpZ2h0KG1hY2hfdGFza19zZWxmKCksIG1fZXhj ZXB0aW9uUG9ydCwgbV9leGNlcHRpb25Qb3J0LCBNQUNIX01TR19UWVBFX01BS0VfU0VORCkgIT0g S0VSTl9TVUNDRVNTKQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KKyNlbmRpZgog CiB9IC8vIG5hbWVzcGFjZSBJUEMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9D aGlsZFByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNz UHJveHkuY3BwCmluZGV4IGEyMjMxZTJkZWQzZjk4M2IxYjJlZWEzNDg4MTEwNzk3YmYwNDRmOGYu LjU4ODdjNTczNzE4MmQyMWU5MmFhM2NkMWE4ZWMxZTI3OGM0NzA5ZWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTI4LDcgKzEyOCw3IEBAIHZv aWQgQ2hpbGRQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIq LCBJUEM6OkNvbm5lY3Rpb246OklkCiAgICAgQVNTRVJUKCFtX2Nvbm5lY3Rpb24pOwogCiAgICAg bV9jb25uZWN0aW9uID0gSVBDOjpDb25uZWN0aW9uOjpjcmVhdGVTZXJ2ZXJDb25uZWN0aW9uKGNv bm5lY3Rpb25JZGVudGlmaWVyLCB0aGlzLCBSdW5Mb29wOjptYWluKCkpOwotI2lmIFBMQVRGT1JN KE1BQykKKyNpZiAhUExBVEZPUk0oSU9TKQogICAgIG1fY29ubmVjdGlvbi0+c2V0U2hvdWxkQ2xv c2VDb25uZWN0aW9uT25NYWNoRXhjZXB0aW9ucygpOwogI2VuZGlmCiAK