207828 2020-02-16 15:16:43 -0800 AX: Adopt _AXSCopyPathForAccessibilityBundle for WebKit 2020-06-03 09:46:39 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=212704 InRadar P2 Normal --- 1 ericliang webkit-unassigned aestes benjamin cdumez cmarcelo commit-queue darin dbates ews-watchlist webkit-bug-importer oldest_to_newest 1619512 0 ericliang 2020-02-16 15:16:43 -0800 AX: Adopt _AXSCopyPathForAccessibilityBundle for WebKit 1619513 1 webkit-bug-importer 2020-02-16 15:16:56 -0800 <rdar://problem/59496899> 1619515 2 390892 ericliang 2020-02-16 15:46:57 -0800 Created attachment 390892 Patch 1619519 3 390892 darin 2020-02-16 16:43:33 -0800 Comment on attachment 390892 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390892&action=review > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:-412 > - accessibilityBundlesPath = (__bridge NSString *)_AXSAccessibilityBundlesPath(); Wouldn’t we want to continue using this on iOS 13? 1619520 4 390892 darin 2020-02-16 16:44:44 -0800 Comment on attachment 390892 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390892&action=review > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:410 > #if HAVE(ACCESSIBILITY_BUNDLES_PATH) We should use a new HAVE for the new function, not redefine the existing HAVE that is named after the existing function. Like HAVE(COPY_PATH_FOR_ACCESSIBILITY_BUNDLE). 1619824 5 ericliang 2020-02-17 13:07:13 -0800 In theory yes we should define a new HAVE, but I was trying to simplify the code, reasons: 1) HAVE_ACCESSIBILITY_BUNDLES_PATH is only used in this one place 2) _AXSAccessibilityBundlesPath() is extremely simple: it just returns "/System/Library/AccessibilitBundles" for iOS and "/System/iOSSupport/System/Library/AccessibilitBundles" for catalyst. 3) The new _AXSCopyPathForAccessibilityBundle is also very simple: it just returns "/System/Library/AccessibilitBundles/WebProcessLoader.axbundle" for iOS and "/System/iOSSupport/System/Library/AccessibilitBundles/WebProcessLoader.axbundle" for catalyst. Based on above three reason, my personal pref (that makes code a little bit easier to read) would be to change the old HAVE and bump to iOS 14. This way, we don't need to have three code paths (1) for less than ios13 (2) for between iOS 13 and iOS 14 (3) for iOS14 and above. Under my preferences, the code that runs in less than iOS 14 is still perfectly valid. But if you think adding the new HAVE still makes more sense, I could for sure switch to that. 1620179 6 390892 darin 2020-02-18 09:21:20 -0800 Comment on attachment 390892 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390892&action=review > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:411 > + return (__bridge_transfer NSString *)_AXSCopyPathForAccessibilityBundle(CFSTR("WebProcessLoader")); In my obsession with encouraging you to keep using the old function, I missed something more important. This file is not compiled with ARC, and in this case I suspect __bridge_transfer is not going to do the right thing. We need something that will compile into a call to autorelease; I think a call to CFAutorelease. I’m going to say review+ but please don’t land this if it’s leaking the string. I don’t think __bridge_transfer actually correctly causes the autorelease needed in non-ARC code. 1621117 7 391264 ericliang 2020-02-19 23:00:48 -0800 Created attachment 391264 Patch 1621406 8 391264 commit-queue 2020-02-20 13:50:38 -0800 Comment on attachment 391264 Patch Clearing flags on attachment: 391264 Committed r257083: <https://trac.webkit.org/changeset/257083> 1621407 9 commit-queue 2020-02-20 13:50:40 -0800 All reviewed patches have been landed. Closing bug. 1658744 10 391264 aestes 2020-06-03 09:46:16 -0700 Comment on attachment 391264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391264&action=review > Source/WTF/wtf/PlatformHave.h:423 > -#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130100 > +#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000 This means that HAVE_ACCESSIBILITY_BUNDLES_PATH is undefined on tvOS and watchOS (because __IPHONE_OS_VERSION_MIN_REQUIRED will never be >= 140000 on those platforms). Was that your intention? Filed <https://webkit.org/b/212704> HAVE(ACCESSIBILITY_BUNDLES_PATH) is defined in terms of PLATFORM(IOS_FAMILY) but only checks the version of __IPHONE_OS_VERSION_MIN_REQUIRED 390892 2020-02-16 15:46:57 -0800 2020-02-19 23:00:46 -0800 Patch bug-207828-20200216154657.patch text/plain 4407 ericliang U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGExZWE2YzhlMzVhNThmNzVlMzExYjdj OTVhZjQ0NzZmY2U0NDUxMmQuLjc5ZjM0NzljMzNkNjJhMzI1MGRmMTJjNTY5YzM0ODliOTJjZGJk ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDItMTYgIEVyaWMgTGlhbmcgIDxlcmljbGlh bmdAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBBZG9wdCBfQVhTQ29weVBhdGhGb3JBY2Nlc3Np YmlsaXR5QnVuZGxlIGZvciBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwNzgyOAorCisgICAgICAgIFVzZSB0aGUgX0FYU0NvcHlQYXRoRm9y QWNjZXNzaWJpbGl0eUJ1bmRsZSBuZXcgQVBJLiBVcGRhdGVkIHRoZSByZXF1aXJlZCBTREsgdmVy c2lvbi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHd0Zi9QbGF0Zm9ybUhhdmUuaDoKKwogMjAyMC0wMi0xNCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0 LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1 NjYzMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKaW5kZXggMmQzOTEwZWMxZGNiZmIyYTRkMDNhMmJlZGM2ZGExN2JhNmEyMzQ5 Ny4uZGNkYjliMDBkMTlkNDU2OWVjZTNhYmJiYmZiMGVhNDVhNDlhNWUyMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAyMC0wMi0xNiAgRXJpYyBMaWFuZyAgPGVyaWNsaWFuZ0BhcHBsZS5j b20+CisKKyAgICAgICAgQVg6IEFkb3B0IF9BWFNDb3B5UGF0aEZvckFjY2Vzc2liaWxpdHlCdW5k bGUgZm9yIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA3ODI4CisKKyAgICAgICAgVXNlIHRoZSBuZXcgU1BJIF9BWFNDb3B5UGF0aEZvckFj Y2Vzc2liaWxpdHlCdW5kbGUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ292ZXJlZCBieSBjaGVja0FjY2Vzc2liaWxpdHlXZWJQcm9jZXNzTG9hZGVy QnVuZGxlSXNMb2FkZWQKKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9pb3MvQWNjZXNzaWJpbGl0 eVN1cHBvcnRTUEkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbToKKyAgICAgICAgKFdlYktpdDo6d2ViUHJvY2Vzc0xvYWRlckFjY2Vzc2liaWxpdHlCdW5k bGVQYXRoKToKKwogMjAyMC0wMi0xNSAgUGF2ZWwgRmVsZG1hbiAgPHBhdmVsLmZlbGRtYW5AZ21h aWwuY29tPgogCiAgICAgICAgIFtHZW9jbHVlXSBBdm9pZCB1c2FnZSBvZiBwcm92aWRlciBpbiBj YWxsYmFja3MgYWZ0ZXIgaXQgaGFzIGJlZW4gZGVzdHJveWVkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCmlu ZGV4IDg2ODZkYjliN2U3ZmQwMGRmYzRkMTlhZWE2OGJjMWMzYjdiMDZiYmQuLjQ1ODMxZjk1YmEw ZGE5Njc1OGExNjFmZjljMmNlNzkxNWRiN2Y3ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3Rm L1BsYXRmb3JtSGF2ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCkBAIC00 MjAsNyArNDIwLDcgQEAKICNkZWZpbmUgSEFWRV9BQ0NFU1NJQklMSVRZX1NVUFBPUlQgMQogI2Vu ZGlmCiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMzAwMDAgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCA+ PSAxMzAxMDAKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9O X01JTl9SRVFVSVJFRCA+PSAxNDAwMDAKICNkZWZpbmUgSEFWRV9BQ0NFU1NJQklMSVRZX0JVTkRM RVNfUEFUSCAxCiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9z cGkvaW9zL0FjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3Jt L3NwaS9pb3MvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAppbmRleCAyNmUyZDM3Y2I0NWNhNjVk OTVmNjY3ZWRmMDc4OWE0MDgyZGUyYThjLi5lYjllYjY0Y2QyNTlkMzhhZWE3NjM2YjE5MTg1ZjMw YzhlNzU3NzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvQWNj ZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p b3MvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaApAQCAtNDMsNyArNDMsNyBAQCBleHRlcm4gQm9v bGVhbiBfQVhTS2V5UmVwZWF0RW5hYmxlZCgpOwogZXh0ZXJuIEJvb2xlYW4gX0FYU0FwcGxpY2F0 aW9uQWNjZXNzaWJpbGl0eUVuYWJsZWQoKTsKIGV4dGVybiBDRlN0cmluZ1JlZiBrQVhTQXBwbGlj YXRpb25BY2Nlc3NpYmlsaXR5RW5hYmxlZE5vdGlmaWNhdGlvbjsKICNpZiBIQVZFKEFDQ0VTU0lC SUxJVFlfQlVORExFU19QQVRIKQotZXh0ZXJuIENGU3RyaW5nUmVmIF9BWFNBY2Nlc3NpYmlsaXR5 QnVuZGxlc1BhdGgoKTsKK2V4dGVybiBDRlN0cmluZ1JlZiBfQVhTQ29weVBhdGhGb3JBY2Nlc3Np YmlsaXR5QnVuZGxlKENGU3RyaW5nUmVmIGJ1bmRsZSk7CiAjZW5kaWYKIAogI2VuZGlmIC8vIFBM QVRGT1JNKElPU19GQU1JTFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h L1dlYlByb2Nlc3NDb2NvYS5tbQppbmRleCAxYjgzMjViYjlhNTEyNzRjOGJlOGQ1YWZlZGMwMjQ5 ZGIzZTZjNTk2Li5hM2YzNzU0M2Q3ZjhlNzBjMGYwNGQ2Nzg0YjNmNmU2N2UyNjhkYWViIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0K QEAgLTQwNywxNyArNDA3LDE1IEBAIHZvaWQgV2ViUHJvY2Vzczo6cmVsZWFzZVByb2Nlc3NXYXNS ZXN1bWVkQXNzZXJ0aW9ucygpCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKIHN0YXRpYyBOU1N0 cmluZyAqd2ViUHJvY2Vzc0xvYWRlckFjY2Vzc2liaWxpdHlCdW5kbGVQYXRoKCkKIHsKLSAgICBO U1N0cmluZyAqYWNjZXNzaWJpbGl0eUJ1bmRsZXNQYXRoID0gbmlsOwogI2lmIEhBVkUoQUNDRVNT SUJJTElUWV9CVU5ETEVTX1BBVEgpCi0gICAgYWNjZXNzaWJpbGl0eUJ1bmRsZXNQYXRoID0gKF9f YnJpZGdlIE5TU3RyaW5nICopX0FYU0FjY2Vzc2liaWxpdHlCdW5kbGVzUGF0aCgpOworICAgIHJl dHVybiAoX19icmlkZ2VfdHJhbnNmZXIgTlNTdHJpbmcgKilfQVhTQ29weVBhdGhGb3JBY2Nlc3Np YmlsaXR5QnVuZGxlKENGU1RSKCJXZWJQcm9jZXNzTG9hZGVyIikpOwogI2Vsc2UKLSAgICBhY2Nl c3NpYmlsaXR5QnVuZGxlc1BhdGggPSAoX19icmlkZ2UgTlNTdHJpbmcgKilHU1N5c3RlbVJvb3RE aXJlY3RvcnkoKTsKKyAgICBOU1N0cmluZyAqcGF0aCA9IChfX2JyaWRnZSBOU1N0cmluZyAqKUdT U3lzdGVtUm9vdERpcmVjdG9yeSgpOwogI2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQotICAgIGFj Y2Vzc2liaWxpdHlCdW5kbGVzUGF0aCA9IFthY2Nlc3NpYmlsaXR5QnVuZGxlc1BhdGggc3RyaW5n QnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lzdGVtL2lPU1N1cHBvcnQiXTsKKyAgICBwYXRo ID0gW3BhdGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lzdGVtL2lPU1N1cHBv cnQiXTsKICNlbmRpZgotICAgIGFjY2Vzc2liaWxpdHlCdW5kbGVzUGF0aCA9IFthY2Nlc3NpYmls aXR5QnVuZGxlc1BhdGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lzdGVtL0xp YnJhcnkvQWNjZXNzaWJpbGl0eUJ1bmRsZXMiXTsKKyAgICByZXR1cm4gW3BhdGggc3RyaW5nQnlB cHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lzdGVtL0xpYnJhcnkvQWNjZXNzaWJpbGl0eUJ1bmRs ZXMvV2ViUHJvY2Vzc0xvYWRlci5heGJ1bmRsZSJdOwogI2VuZGlmIC8vIEhBVkUoQUNDRVNTSUJJ TElUWV9CVU5ETEVTX1BBVEgpCi0gICAgcmV0dXJuIFthY2Nlc3NpYmlsaXR5QnVuZGxlc1BhdGgg c3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2ViUHJvY2Vzc0xvYWRlci5heGJ1bmRs ZSJdOwogfQogI2VuZGlmCiAK 391264 2020-02-19 23:00:48 -0800 2020-02-20 13:50:38 -0800 Patch bug-207828-20200219230047.patch text/plain 4413 ericliang U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGExZWE2YzhlMzVhNThmNzVlMzExYjdj OTVhZjQ0NzZmY2U0NDUxMmQuLjc5ZjM0NzljMzNkNjJhMzI1MGRmMTJjNTY5YzM0ODliOTJjZGJk ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDItMTYgIEVyaWMgTGlhbmcgIDxlcmljbGlh bmdAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBBZG9wdCBfQVhTQ29weVBhdGhGb3JBY2Nlc3Np YmlsaXR5QnVuZGxlIGZvciBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwNzgyOAorCisgICAgICAgIFVzZSB0aGUgX0FYU0NvcHlQYXRoRm9y QWNjZXNzaWJpbGl0eUJ1bmRsZSBuZXcgQVBJLiBVcGRhdGVkIHRoZSByZXF1aXJlZCBTREsgdmVy c2lvbi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHd0Zi9QbGF0Zm9ybUhhdmUuaDoKKwogMjAyMC0wMi0xNCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0 LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI1 NjYzMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKaW5kZXggMmQzOTEwZWMxZGNiZmIyYTRkMDNhMmJlZGM2ZGExN2JhNmEyMzQ5 Ny4uZGNkYjliMDBkMTlkNDU2OWVjZTNhYmJiYmZiMGVhNDVhNDlhNWUyMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAyMC0wMi0xNiAgRXJpYyBMaWFuZyAgPGVyaWNsaWFuZ0BhcHBsZS5j b20+CisKKyAgICAgICAgQVg6IEFkb3B0IF9BWFNDb3B5UGF0aEZvckFjY2Vzc2liaWxpdHlCdW5k bGUgZm9yIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA3ODI4CisKKyAgICAgICAgVXNlIHRoZSBuZXcgU1BJIF9BWFNDb3B5UGF0aEZvckFj Y2Vzc2liaWxpdHlCdW5kbGUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ292ZXJlZCBieSBjaGVja0FjY2Vzc2liaWxpdHlXZWJQcm9jZXNzTG9hZGVy QnVuZGxlSXNMb2FkZWQKKworICAgICAgICAqIFBsYXRmb3JtL3NwaS9pb3MvQWNjZXNzaWJpbGl0 eVN1cHBvcnRTUEkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbToKKyAgICAgICAgKFdlYktpdDo6d2ViUHJvY2Vzc0xvYWRlckFjY2Vzc2liaWxpdHlCdW5k bGVQYXRoKToKKwogMjAyMC0wMi0xNSAgUGF2ZWwgRmVsZG1hbiAgPHBhdmVsLmZlbGRtYW5AZ21h aWwuY29tPgogCiAgICAgICAgIFtHZW9jbHVlXSBBdm9pZCB1c2FnZSBvZiBwcm92aWRlciBpbiBj YWxsYmFja3MgYWZ0ZXIgaXQgaGFzIGJlZW4gZGVzdHJveWVkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCmlu ZGV4IDg2ODZkYjliN2U3ZmQwMGRmYzRkMTlhZWE2OGJjMWMzYjdiMDZiYmQuLjQ1ODMxZjk1YmEw ZGE5Njc1OGExNjFmZjljMmNlNzkxNWRiN2Y3ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3Rm L1BsYXRmb3JtSGF2ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCkBAIC00 MjAsNyArNDIwLDcgQEAKICNkZWZpbmUgSEFWRV9BQ0NFU1NJQklMSVRZX1NVUFBPUlQgMQogI2Vu ZGlmCiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMzAwMDAgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCA+ PSAxMzAxMDAKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9O X01JTl9SRVFVSVJFRCA+PSAxNDAwMDAKICNkZWZpbmUgSEFWRV9BQ0NFU1NJQklMSVRZX0JVTkRM RVNfUEFUSCAxCiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9z cGkvaW9zL0FjY2Vzc2liaWxpdHlTdXBwb3J0U1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3Jt L3NwaS9pb3MvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAppbmRleCAyNmUyZDM3Y2I0NWNhNjVk OTVmNjY3ZWRmMDc4OWE0MDgyZGUyYThjLi5lYjllYjY0Y2QyNTlkMzhhZWE3NjM2YjE5MTg1ZjMw YzhlNzU3NzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvQWNj ZXNzaWJpbGl0eVN1cHBvcnRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p b3MvQWNjZXNzaWJpbGl0eVN1cHBvcnRTUEkuaApAQCAtNDMsNyArNDMsNyBAQCBleHRlcm4gQm9v bGVhbiBfQVhTS2V5UmVwZWF0RW5hYmxlZCgpOwogZXh0ZXJuIEJvb2xlYW4gX0FYU0FwcGxpY2F0 aW9uQWNjZXNzaWJpbGl0eUVuYWJsZWQoKTsKIGV4dGVybiBDRlN0cmluZ1JlZiBrQVhTQXBwbGlj YXRpb25BY2Nlc3NpYmlsaXR5RW5hYmxlZE5vdGlmaWNhdGlvbjsKICNpZiBIQVZFKEFDQ0VTU0lC SUxJVFlfQlVORExFU19QQVRIKQotZXh0ZXJuIENGU3RyaW5nUmVmIF9BWFNBY2Nlc3NpYmlsaXR5 QnVuZGxlc1BhdGgoKTsKK2V4dGVybiBDRlN0cmluZ1JlZiBfQVhTQ29weVBhdGhGb3JBY2Nlc3Np YmlsaXR5QnVuZGxlKENGU3RyaW5nUmVmIGJ1bmRsZSk7CiAjZW5kaWYKIAogI2VuZGlmIC8vIFBM QVRGT1JNKElPU19GQU1JTFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h L1dlYlByb2Nlc3NDb2NvYS5tbQppbmRleCAxYjgzMjViYjlhNTEyNzRjOGJlOGQ1YWZlZGMwMjQ5 ZGIzZTZjNTk2Li5iMzEyMzM4ZGQ3Y2U1MjFiZDU0YmUwNGE2NDIzZjA0NWVhZDBiZWIxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0K QEAgLTQwNywxNyArNDA3LDE1IEBAIHZvaWQgV2ViUHJvY2Vzczo6cmVsZWFzZVByb2Nlc3NXYXNS ZXN1bWVkQXNzZXJ0aW9ucygpCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKIHN0YXRpYyBOU1N0 cmluZyAqd2ViUHJvY2Vzc0xvYWRlckFjY2Vzc2liaWxpdHlCdW5kbGVQYXRoKCkKIHsKLSAgICBO U1N0cmluZyAqYWNjZXNzaWJpbGl0eUJ1bmRsZXNQYXRoID0gbmlsOwogI2lmIEhBVkUoQUNDRVNT SUJJTElUWV9CVU5ETEVTX1BBVEgpCi0gICAgYWNjZXNzaWJpbGl0eUJ1bmRsZXNQYXRoID0gKF9f YnJpZGdlIE5TU3RyaW5nICopX0FYU0FjY2Vzc2liaWxpdHlCdW5kbGVzUGF0aCgpOworICAgIHJl dHVybiAoX19icmlkZ2UgTlNTdHJpbmcgKilDRkF1dG9yZWxlYXNlKF9BWFNDb3B5UGF0aEZvckFj Y2Vzc2liaWxpdHlCdW5kbGUoQ0ZTVFIoIldlYlByb2Nlc3NMb2FkZXIiKSkpOwogI2Vsc2UKLSAg ICBhY2Nlc3NpYmlsaXR5QnVuZGxlc1BhdGggPSAoX19icmlkZ2UgTlNTdHJpbmcgKilHU1N5c3Rl bVJvb3REaXJlY3RvcnkoKTsKKyAgICBOU1N0cmluZyAqcGF0aCA9IChfX2JyaWRnZSBOU1N0cmlu ZyAqKUdTU3lzdGVtUm9vdERpcmVjdG9yeSgpOwogI2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQot ICAgIGFjY2Vzc2liaWxpdHlCdW5kbGVzUGF0aCA9IFthY2Nlc3NpYmlsaXR5QnVuZGxlc1BhdGgg c3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lzdGVtL2lPU1N1cHBvcnQiXTsKKyAg ICBwYXRoID0gW3BhdGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lzdGVtL2lP U1N1cHBvcnQiXTsKICNlbmRpZgotICAgIGFjY2Vzc2liaWxpdHlCdW5kbGVzUGF0aCA9IFthY2Nl c3NpYmlsaXR5QnVuZGxlc1BhdGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lz dGVtL0xpYnJhcnkvQWNjZXNzaWJpbGl0eUJ1bmRsZXMiXTsKKyAgICByZXR1cm4gW3BhdGggc3Ry aW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiU3lzdGVtL0xpYnJhcnkvQWNjZXNzaWJpbGl0 eUJ1bmRsZXMvV2ViUHJvY2Vzc0xvYWRlci5heGJ1bmRsZSJdOwogI2VuZGlmIC8vIEhBVkUoQUND RVNTSUJJTElUWV9CVU5ETEVTX1BBVEgpCi0gICAgcmV0dXJuIFthY2Nlc3NpYmlsaXR5QnVuZGxl c1BhdGggc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2ViUHJvY2Vzc0xvYWRlci5h eGJ1bmRsZSJdOwogfQogI2VuZGlmCiAK