186152 2018-05-31 11:19:16 -0700 Fix leak of AudioDeviceID array due to an early return in AudioDeviceMac::GetNumberDevices() 2018-05-31 12:51:37 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.chromium.org/p/webrtc/issues/detail?id=9348 InRadar P2 Normal --- 1 ddkilzer ddkilzer achristensen bfulgham commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1428918 0 ddkilzer 2018-05-31 11:19:16 -0700 Fix leak of AudioDeviceID array due to an early return in AudioDeviceMac::GetNumberDevices(): Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/mac/audio_device_mac.cc:1586:3: warning: Potential leak of memory pointed to by 'deviceIds' WEBRTC_CA_RETURN_ON_ERR(AudioObjectGetPropertyData(kAudioObjectSystemObject, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/mac/audio_device_mac.cc:30:7: note: expanded from macro 'WEBRTC_CA_RETURN_ON_ERR' logCAMsg(rtc::LS_ERROR, "Error in " #expr, (const char*)&err); \ ^~~~~~~~ We can use RAII with std::unique_ptr<>() to fix the leak and remove manual release of the memory using this technique: <https://www.codeproject.com/Articles/820931/Using-std-unique-ptr-RAII-with-malloc-and-free> 1428923 1 webkit-bug-importer 2018-05-31 11:26:07 -0700 <rdar://problem/40692824> 1428925 2 341679 ddkilzer 2018-05-31 11:34:05 -0700 Created attachment 341679 Patch v1 1428927 3 341679 achristensen 2018-05-31 11:39:28 -0700 Comment on attachment 341679 Patch v1 Can't we use std::make_unique? 1428948 4 ddkilzer 2018-05-31 12:03:31 -0700 (In reply to Alex Christensen from comment #3) > Comment on attachment 341679 [details] > Patch v1 > > Can't we use std::make_unique? I was aiming to change the code as little as possible, but yes we can! New patch forthcoming. 1428949 5 341681 ddkilzer 2018-05-31 12:04:03 -0700 Created attachment 341681 Patch v2 1428954 6 341684 ddkilzer 2018-05-31 12:11:24 -0700 Created attachment 341684 Patch v3 Remove 'const' from 'numberDevices' since it used in an in-out context in AudioObjectGetPropertyData(). 1428971 7 341684 commit-queue 2018-05-31 12:51:35 -0700 Comment on attachment 341684 Patch v3 Clearing flags on attachment: 341684 Committed r232365: <https://trac.webkit.org/changeset/232365> 1428972 8 commit-queue 2018-05-31 12:51:37 -0700 All reviewed patches have been landed. Closing bug. 341679 2018-05-31 11:34:05 -0700 2018-05-31 12:04:02 -0700 Patch v1 bug-186152-20180531113404.patch text/plain 5702 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCAyNmM3ZjVkYjc0NWZiOGI4YWQwNzFiZWY5MzA2NjdjZTRjMjk4ODdjLi4wODQ3 MjA4NmFiNWRiNDRlNjZjMWQwNzg4OTNjMWU3NTdkY2NiYWIxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNS0zMSAgRGF2aWQgS2ls emVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBsZWFrIG9mIEF1ZGlvRGV2 aWNlSUQgYXJyYXkgZHVlIHRvIGFuIGVhcmx5IHJldHVybiBpbiBBdWRpb0RldmljZU1hYzo6R2V0 TnVtYmVyRGV2aWNlcygpCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xODYxNTI+Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MDY5MjgyND4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19k ZXZpY2UvbWFjL2F1ZGlvX2RldmljZV9tYWMuY2M6CisgICAgICAgIFVzZSBzdGQ6OnVuaXF1ZV9w dHI8PiBzbyB0aGF0IG1lbW9yeSBpcyBmcmVlZCB3aGVuIHRoZSBwb2ludGVyCisgICAgICAgIGdv ZXMgb3V0IG9mIHNjb3BlLiAgQ2xlYW4gdXAgbWFudWFsIGNhbGxzIHRvIGZyZWUoKS4KKyAgICAg ICAgKiBXZWJLaXQvMDAxMS1GaXgtQXVkaW9EZXZpY2VJRC1hcnJheS1sZWFrLnBhdGNoOiBBZGQu CisKIDIwMTgtMDUtMzAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBGaXggbGVhayBvZiBhIENWUGl4ZWxCdWZmZXJSZWYgZHVlIHRvIGVhcmx5IHJlcnR1cm4g aW4gLVtSVENWaWRlb0VuY29kZXJIMjY0IGVuY29kZTpjb2RlY1NwZWNpZmljSW5mbzpmcmFtZVR5 cGVzOl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2Vi cnRjL21vZHVsZXMvYXVkaW9fZGV2aWNlL21hYy9hdWRpb19kZXZpY2VfbWFjLmNjIGIvU291cmNl L1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19kZXZpY2Uv bWFjL2F1ZGlvX2RldmljZV9tYWMuY2MKaW5kZXggYzU4NWMzMmNhZmMzMGY0MGMyZGQwMGJjOTA5 NjQ5ODc2ZGEyMGQ2YS4uN2I5ZDFmZWUyOWUxNTVjODM0MmI3MTJiNTIwMWRkOWU4NzU5MmZkZSAx MDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbW9k dWxlcy9hdWRpb19kZXZpY2UvbWFjL2F1ZGlvX2RldmljZV9tYWMuY2MKKysrIGIvU291cmNlL1Ro aXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19kZXZpY2UvbWFj L2F1ZGlvX2RldmljZV9tYWMuY2MKQEAgLTE5LDYgKzE5LDcgQEAKICNpbmNsdWRlIDxBcHBsaWNh dGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KICNpbmNsdWRlIDxsaWJrZXJuL09T QXRvbWljLmg+ICAvLyBPU0F0b21pY0NvbXBhcmVBbmRTd2FwKCkKICNpbmNsdWRlIDxtYWNoL21h Y2guaD4gICAgICAgICAvLyBtYWNoX3Rhc2tfc2VsZigpCisjaW5jbHVkZSA8bWVtb3J5PiAgICAg ICAgICAgICAgLy8gc3RkOjp1bmlxdWVfcHRyPD4oKQogI2luY2x1ZGUgPHN5cy9zeXNjdGwuaD4g ICAgICAgIC8vIHN5c2N0bGJ5bmFtZSgpCiAKIG5hbWVzcGFjZSB3ZWJydGMgewpAQCAtMTU2NCw3 ICsxNTY1LDcgQEAgaW50MzJfdCBBdWRpb0RldmljZU1hYzo6R2V0TnVtYmVyRGV2aWNlcyhjb25z dCBBdWRpb09iamVjdFByb3BlcnR5U2NvcGUgc2NvcGUsCiAgICAgcmV0dXJuIDA7CiAgIH0KIAot ICBBdWRpb0RldmljZUlEKiBkZXZpY2VJZHMgPSAoQXVkaW9EZXZpY2VJRCopbWFsbG9jKHNpemUp OworICBzdGQ6OnVuaXF1ZV9wdHI8QXVkaW9EZXZpY2VJRFtdLCBkZWNsdHlwZShmcmVlKSo+IGRl dmljZUlkcyhyZWludGVycHJldF9jYXN0PEF1ZGlvRGV2aWNlSUQqPihtYWxsb2Moc2l6ZSkpLCBm cmVlKTsKICAgVUludDMyIG51bWJlckRldmljZXMgPSBzaXplIC8gc2l6ZW9mKEF1ZGlvRGV2aWNl SUQpOwogICBBdWRpb0J1ZmZlckxpc3QqIGJ1ZmZlckxpc3QgPSBOVUxMOwogICBVSW50MzIgbnVt YmVyU2NvcGVkRGV2aWNlcyA9IDA7CkBAIC0xNTk3LDcgKzE1OTgsNyBAQCBpbnQzMl90IEF1ZGlv RGV2aWNlTWFjOjpHZXROdW1iZXJEZXZpY2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29w ZSBzY29wZSwKICAgYm9vbCBsaXN0T0sgPSB0cnVlOwogCiAgIFdFQlJUQ19DQV9MT0dfRVJSKEF1 ZGlvT2JqZWN0R2V0UHJvcGVydHlEYXRhKAotICAgICAga0F1ZGlvT2JqZWN0U3lzdGVtT2JqZWN0 LCAmcHJvcGVydHlBZGRyZXNzLCAwLCBOVUxMLCAmc2l6ZSwgZGV2aWNlSWRzKSk7CisgICAgICBr QXVkaW9PYmplY3RTeXN0ZW1PYmplY3QsICZwcm9wZXJ0eUFkZHJlc3MsIDAsIE5VTEwsICZzaXpl LCBkZXZpY2VJZHMuZ2V0KCkpKTsKICAgaWYgKGVyciAhPSBub0VycikgewogICAgIGxpc3RPSyA9 IGZhbHNlOwogICB9IGVsc2UgewpAQCAtMTY0MSwxMSArMTY0Miw2IEBAIGludDMyX3QgQXVkaW9E ZXZpY2VNYWM6OkdldE51bWJlckRldmljZXMoY29uc3QgQXVkaW9PYmplY3RQcm9wZXJ0eVNjb3Bl IHNjb3BlLAogICB9CiAKICAgaWYgKCFsaXN0T0spIHsKLSAgICBpZiAoZGV2aWNlSWRzKSB7Ci0g ICAgICBmcmVlKGRldmljZUlkcyk7Ci0gICAgICBkZXZpY2VJZHMgPSBOVUxMOwotICAgIH0KLQog ICAgIGlmIChidWZmZXJMaXN0KSB7CiAgICAgICBmcmVlKGJ1ZmZlckxpc3QpOwogICAgICAgYnVm ZmVyTGlzdCA9IE5VTEw7CkBAIC0xNjU0LDEyICsxNjUwLDYgQEAgaW50MzJfdCBBdWRpb0Rldmlj ZU1hYzo6R2V0TnVtYmVyRGV2aWNlcyhjb25zdCBBdWRpb09iamVjdFByb3BlcnR5U2NvcGUgc2Nv cGUsCiAgICAgcmV0dXJuIC0xOwogICB9CiAKLSAgLy8gSGFwcHkgZW5kaW5nCi0gIGlmIChkZXZp Y2VJZHMpIHsKLSAgICBmcmVlKGRldmljZUlkcyk7Ci0gICAgZGV2aWNlSWRzID0gTlVMTDsKLSAg fQotCiAgIHJldHVybiBudW1iZXJTY29wZWREZXZpY2VzOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvV2ViS2l0LzAwMTEtRml4LUF1ZGlvRGV2aWNlSUQtYXJy YXktbGVhay5wYXRjaCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvMDAxMS1G aXgtQXVkaW9EZXZpY2VJRC1hcnJheS1sZWFrLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUxZDQ5ZmJmMWFi YmFlZTU4M2RiMWQxYzJlYzE2MGQyM2YyMjQyZTEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvV2ViS2l0LzAwMTEtRml4LUF1ZGlvRGV2aWNlSUQtYXJyYXkt bGVhay5wYXRjaApAQCAtMCwwICsxLDU1IEBACitkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFy dHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19kZXZpY2UvbWFjL2F1ZGlv X2RldmljZV9tYWMuY2MgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0 Yy9tb2R1bGVzL2F1ZGlvX2RldmljZS9tYWMvYXVkaW9fZGV2aWNlX21hYy5jYworaW5kZXggYzU4 NWMzMmNhZmMuLjdiOWQxZmVlMjllIDEwMDY0NAorLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGli d2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19kZXZpY2UvbWFjL2F1ZGlvX2Rldmlj ZV9tYWMuY2MKKysrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRj L21vZHVsZXMvYXVkaW9fZGV2aWNlL21hYy9hdWRpb19kZXZpY2VfbWFjLmNjCitAQCAtMTksNiAr MTksNyBAQAorICNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2Vydmlj ZXMuaD4KKyAjaW5jbHVkZSA8bGlia2Vybi9PU0F0b21pYy5oPiAgLy8gT1NBdG9taWNDb21wYXJl QW5kU3dhcCgpCisgI2luY2x1ZGUgPG1hY2gvbWFjaC5oPiAgICAgICAgIC8vIG1hY2hfdGFza19z ZWxmKCkKKysjaW5jbHVkZSA8bWVtb3J5PiAgICAgICAgICAgICAgLy8gc3RkOjp1bmlxdWVfcHRy PD4oKQorICNpbmNsdWRlIDxzeXMvc3lzY3RsLmg+ICAgICAgICAvLyBzeXNjdGxieW5hbWUoKQor IAorIG5hbWVzcGFjZSB3ZWJydGMgeworQEAgLTE1NjQsNyArMTU2NSw3IEBAIGludDMyX3QgQXVk aW9EZXZpY2VNYWM6OkdldE51bWJlckRldmljZXMoY29uc3QgQXVkaW9PYmplY3RQcm9wZXJ0eVNj b3BlIHNjb3BlLAorICAgICByZXR1cm4gMDsKKyAgIH0KKyAKKy0gIEF1ZGlvRGV2aWNlSUQqIGRl dmljZUlkcyA9IChBdWRpb0RldmljZUlEKiltYWxsb2Moc2l6ZSk7CisrICBzdGQ6OnVuaXF1ZV9w dHI8QXVkaW9EZXZpY2VJRFtdLCBkZWNsdHlwZShmcmVlKSo+IGRldmljZUlkcyhyZWludGVycHJl dF9jYXN0PEF1ZGlvRGV2aWNlSUQqPihtYWxsb2Moc2l6ZSkpLCBmcmVlKTsKKyAgIFVJbnQzMiBu dW1iZXJEZXZpY2VzID0gc2l6ZSAvIHNpemVvZihBdWRpb0RldmljZUlEKTsKKyAgIEF1ZGlvQnVm ZmVyTGlzdCogYnVmZmVyTGlzdCA9IE5VTEw7CisgICBVSW50MzIgbnVtYmVyU2NvcGVkRGV2aWNl cyA9IDA7CitAQCAtMTU5Nyw3ICsxNTk4LDcgQEAgaW50MzJfdCBBdWRpb0RldmljZU1hYzo6R2V0 TnVtYmVyRGV2aWNlcyhjb25zdCBBdWRpb09iamVjdFByb3BlcnR5U2NvcGUgc2NvcGUsCisgICBi b29sIGxpc3RPSyA9IHRydWU7CisgCisgICBXRUJSVENfQ0FfTE9HX0VSUihBdWRpb09iamVjdEdl dFByb3BlcnR5RGF0YSgKKy0gICAgICBrQXVkaW9PYmplY3RTeXN0ZW1PYmplY3QsICZwcm9wZXJ0 eUFkZHJlc3MsIDAsIE5VTEwsICZzaXplLCBkZXZpY2VJZHMpKTsKKysgICAgICBrQXVkaW9PYmpl Y3RTeXN0ZW1PYmplY3QsICZwcm9wZXJ0eUFkZHJlc3MsIDAsIE5VTEwsICZzaXplLCBkZXZpY2VJ ZHMuZ2V0KCkpKTsKKyAgIGlmIChlcnIgIT0gbm9FcnIpIHsKKyAgICAgbGlzdE9LID0gZmFsc2U7 CisgICB9IGVsc2UgeworQEAgLTE2NDEsMTEgKzE2NDIsNiBAQCBpbnQzMl90IEF1ZGlvRGV2aWNl TWFjOjpHZXROdW1iZXJEZXZpY2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29wZSBzY29w ZSwKKyAgIH0KKyAKKyAgIGlmICghbGlzdE9LKSB7CistICAgIGlmIChkZXZpY2VJZHMpIHsKKy0g ICAgICBmcmVlKGRldmljZUlkcyk7CistICAgICAgZGV2aWNlSWRzID0gTlVMTDsKKy0gICAgfQor LQorICAgICBpZiAoYnVmZmVyTGlzdCkgeworICAgICAgIGZyZWUoYnVmZmVyTGlzdCk7CisgICAg ICAgYnVmZmVyTGlzdCA9IE5VTEw7CitAQCAtMTY1NCwxMiArMTY1MCw2IEBAIGludDMyX3QgQXVk aW9EZXZpY2VNYWM6OkdldE51bWJlckRldmljZXMoY29uc3QgQXVkaW9PYmplY3RQcm9wZXJ0eVNj b3BlIHNjb3BlLAorICAgICByZXR1cm4gLTE7CisgICB9CisgCistICAvLyBIYXBweSBlbmRpbmcK Ky0gIGlmIChkZXZpY2VJZHMpIHsKKy0gICAgZnJlZShkZXZpY2VJZHMpOworLSAgICBkZXZpY2VJ ZHMgPSBOVUxMOworLSAgfQorLQorICAgcmV0dXJuIG51bWJlclNjb3BlZERldmljZXM7CisgfQor IAo= 341681 2018-05-31 12:04:03 -0700 2018-05-31 12:11:23 -0700 Patch v2 bug-186152-20180531120403.patch text/plain 5784 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCBlMThiYzVhMzIyMWM4N2Y3MGVhYThiYTJjNWM4OWVlNTBjZmJlY2MyLi5jMTgz YmRjNDM0NDNmNTVjOTI5ZjM4ZDFjZTA4YTI2YzVlY2Y2YjU3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNS0zMSAgRGF2aWQgS2ls emVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBsZWFrIG9mIEF1ZGlvRGV2 aWNlSUQgYXJyYXkgZHVlIHRvIGFuIGVhcmx5IHJldHVybiBpbiBBdWRpb0RldmljZU1hYzo6R2V0 TnVtYmVyRGV2aWNlcygpCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xODYxNTI+Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MDY5MjgyND4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19k ZXZpY2UvbWFjL2F1ZGlvX2RldmljZV9tYWMuY2M6CisgICAgICAgIFVzZSBzdGQ6Om1ha2VfdW5p cXVlPD4gc28gdGhhdCBtZW1vcnkgaXMgYWxsb2NhdGVkIGFuZAorICAgICAgICBkZWFsbG9jYXRl ZCBhdXRvbWF0aWNhbGx5LiAgUmVtb3ZlIG1hbnVhbCBjYWxscyB0byBmcmVlKCkuCisgICAgICAg ICogV2ViS2l0LzAwMTEtRml4LUF1ZGlvRGV2aWNlSUQtYXJyYXktbGVhay5wYXRjaDogQWRkLgor CiAyMDE4LTA1LTMwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAg ICAgRml4IGxlYWsgb2YgYSBDVlBpeGVsQnVmZmVyUmVmIGR1ZSB0byBlYXJseSByZXJ0dXJuIGlu IC1bUlRDVmlkZW9FbmNvZGVySDI2NCBlbmNvZGU6Y29kZWNTcGVjaWZpY0luZm86ZnJhbWVUeXBl czpdCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0 Yy9tb2R1bGVzL2F1ZGlvX2RldmljZS9tYWMvYXVkaW9fZGV2aWNlX21hYy5jYyBiL1NvdXJjZS9U aGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVsZXMvYXVkaW9fZGV2aWNlL21h Yy9hdWRpb19kZXZpY2VfbWFjLmNjCmluZGV4IGM1ODVjMzJjYWZjMzBmNDBjMmRkMDBiYzkwOTY0 OTg3NmRhMjBkNmEuLmVlNGVkMDc2ZmU3ZjRmOTM4YjNlMzJhOTEzZWQxMzUyZjY3ZWQ2YTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVs ZXMvYXVkaW9fZGV2aWNlL21hYy9hdWRpb19kZXZpY2VfbWFjLmNjCisrKyBiL1NvdXJjZS9UaGly ZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVsZXMvYXVkaW9fZGV2aWNlL21hYy9h dWRpb19kZXZpY2VfbWFjLmNjCkBAIC0xOSw2ICsxOSw3IEBACiAjaW5jbHVkZSA8QXBwbGljYXRp b25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CiAjaW5jbHVkZSA8bGlia2Vybi9PU0F0 b21pYy5oPiAgLy8gT1NBdG9taWNDb21wYXJlQW5kU3dhcCgpCiAjaW5jbHVkZSA8bWFjaC9tYWNo Lmg+ICAgICAgICAgLy8gbWFjaF90YXNrX3NlbGYoKQorI2luY2x1ZGUgPG1lbW9yeT4gICAgICAg ICAgICAgIC8vIHN0ZDo6bWFrZV91bmlxdWU8PigpIGFuZCBzdGQ6OnVuaXF1ZV9wdHI8PigpCiAj aW5jbHVkZSA8c3lzL3N5c2N0bC5oPiAgICAgICAgLy8gc3lzY3RsYnluYW1lKCkKIAogbmFtZXNw YWNlIHdlYnJ0YyB7CkBAIC0xNTY0LDggKzE1NjUsOCBAQCBpbnQzMl90IEF1ZGlvRGV2aWNlTWFj OjpHZXROdW1iZXJEZXZpY2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29wZSBzY29wZSwK ICAgICByZXR1cm4gMDsKICAgfQogCi0gIEF1ZGlvRGV2aWNlSUQqIGRldmljZUlkcyA9IChBdWRp b0RldmljZUlEKiltYWxsb2Moc2l6ZSk7Ci0gIFVJbnQzMiBudW1iZXJEZXZpY2VzID0gc2l6ZSAv IHNpemVvZihBdWRpb0RldmljZUlEKTsKKyAgY29uc3QgVUludDMyIG51bWJlckRldmljZXMgPSBz aXplIC8gc2l6ZW9mKEF1ZGlvRGV2aWNlSUQpOworICBhdXRvIGRldmljZUlkcyA9IHN0ZDo6bWFr ZV91bmlxdWU8QXVkaW9EZXZpY2VJRFtdPihudW1iZXJEZXZpY2VzKTsKICAgQXVkaW9CdWZmZXJM aXN0KiBidWZmZXJMaXN0ID0gTlVMTDsKICAgVUludDMyIG51bWJlclNjb3BlZERldmljZXMgPSAw OwogCkBAIC0xNTk3LDcgKzE1OTgsNyBAQCBpbnQzMl90IEF1ZGlvRGV2aWNlTWFjOjpHZXROdW1i ZXJEZXZpY2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29wZSBzY29wZSwKICAgYm9vbCBs aXN0T0sgPSB0cnVlOwogCiAgIFdFQlJUQ19DQV9MT0dfRVJSKEF1ZGlvT2JqZWN0R2V0UHJvcGVy dHlEYXRhKAotICAgICAga0F1ZGlvT2JqZWN0U3lzdGVtT2JqZWN0LCAmcHJvcGVydHlBZGRyZXNz LCAwLCBOVUxMLCAmc2l6ZSwgZGV2aWNlSWRzKSk7CisgICAgICBrQXVkaW9PYmplY3RTeXN0ZW1P YmplY3QsICZwcm9wZXJ0eUFkZHJlc3MsIDAsIE5VTEwsICZzaXplLCBkZXZpY2VJZHMuZ2V0KCkp KTsKICAgaWYgKGVyciAhPSBub0VycikgewogICAgIGxpc3RPSyA9IGZhbHNlOwogICB9IGVsc2Ug ewpAQCAtMTY0MSwxMSArMTY0Miw2IEBAIGludDMyX3QgQXVkaW9EZXZpY2VNYWM6OkdldE51bWJl ckRldmljZXMoY29uc3QgQXVkaW9PYmplY3RQcm9wZXJ0eVNjb3BlIHNjb3BlLAogICB9CiAKICAg aWYgKCFsaXN0T0spIHsKLSAgICBpZiAoZGV2aWNlSWRzKSB7Ci0gICAgICBmcmVlKGRldmljZUlk cyk7Ci0gICAgICBkZXZpY2VJZHMgPSBOVUxMOwotICAgIH0KLQogICAgIGlmIChidWZmZXJMaXN0 KSB7CiAgICAgICBmcmVlKGJ1ZmZlckxpc3QpOwogICAgICAgYnVmZmVyTGlzdCA9IE5VTEw7CkBA IC0xNjU0LDEyICsxNjUwLDYgQEAgaW50MzJfdCBBdWRpb0RldmljZU1hYzo6R2V0TnVtYmVyRGV2 aWNlcyhjb25zdCBBdWRpb09iamVjdFByb3BlcnR5U2NvcGUgc2NvcGUsCiAgICAgcmV0dXJuIC0x OwogICB9CiAKLSAgLy8gSGFwcHkgZW5kaW5nCi0gIGlmIChkZXZpY2VJZHMpIHsKLSAgICBmcmVl KGRldmljZUlkcyk7Ci0gICAgZGV2aWNlSWRzID0gTlVMTDsKLSAgfQotCiAgIHJldHVybiBudW1i ZXJTY29wZWREZXZpY2VzOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3 ZWJydGMvV2ViS2l0LzAwMTEtRml4LUF1ZGlvRGV2aWNlSUQtYXJyYXktbGVhay5wYXRjaCBiL1Nv dXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvMDAxMS1GaXgtQXVkaW9EZXZpY2VJRC1h cnJheS1sZWFrLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjcxY2Y0OGE3N2JkMWRlZjRiN2Q0ZWQwY2M4NmU3 OGFmMjlmMjkxMGEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvV2ViS2l0LzAwMTEtRml4LUF1ZGlvRGV2aWNlSUQtYXJyYXktbGVhay5wYXRjaApAQCAtMCww ICsxLDU3IEBACitkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJj ZS93ZWJydGMvbW9kdWxlcy9hdWRpb19kZXZpY2UvbWFjL2F1ZGlvX2RldmljZV9tYWMuY2MgYi9T b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tb2R1bGVzL2F1ZGlvX2Rl dmljZS9tYWMvYXVkaW9fZGV2aWNlX21hYy5jYworaW5kZXggYzU4NWMzMmNhZmMuLmVlNGVkMDc2 ZmU3IDEwMDY0NAorLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJy dGMvbW9kdWxlcy9hdWRpb19kZXZpY2UvbWFjL2F1ZGlvX2RldmljZV9tYWMuY2MKKysrKyBiL1Nv dXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVsZXMvYXVkaW9fZGV2 aWNlL21hYy9hdWRpb19kZXZpY2VfbWFjLmNjCitAQCAtMTksNiArMTksNyBAQAorICNpbmNsdWRl IDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9uU2VydmljZXMuaD4KKyAjaW5jbHVkZSA8 bGlia2Vybi9PU0F0b21pYy5oPiAgLy8gT1NBdG9taWNDb21wYXJlQW5kU3dhcCgpCisgI2luY2x1 ZGUgPG1hY2gvbWFjaC5oPiAgICAgICAgIC8vIG1hY2hfdGFza19zZWxmKCkKKysjaW5jbHVkZSA8 bWVtb3J5PiAgICAgICAgICAgICAgLy8gc3RkOjptYWtlX3VuaXF1ZTw+KCkgYW5kIHN0ZDo6dW5p cXVlX3B0cjw+KCkKKyAjaW5jbHVkZSA8c3lzL3N5c2N0bC5oPiAgICAgICAgLy8gc3lzY3RsYnlu YW1lKCkKKyAKKyBuYW1lc3BhY2Ugd2VicnRjIHsKK0BAIC0xNTY0LDggKzE1NjUsOCBAQCBpbnQz Ml90IEF1ZGlvRGV2aWNlTWFjOjpHZXROdW1iZXJEZXZpY2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJv cGVydHlTY29wZSBzY29wZSwKKyAgICAgcmV0dXJuIDA7CisgICB9CisgCistICBBdWRpb0Rldmlj ZUlEKiBkZXZpY2VJZHMgPSAoQXVkaW9EZXZpY2VJRCopbWFsbG9jKHNpemUpOworLSAgVUludDMy IG51bWJlckRldmljZXMgPSBzaXplIC8gc2l6ZW9mKEF1ZGlvRGV2aWNlSUQpOworKyAgY29uc3Qg VUludDMyIG51bWJlckRldmljZXMgPSBzaXplIC8gc2l6ZW9mKEF1ZGlvRGV2aWNlSUQpOworKyAg YXV0byBkZXZpY2VJZHMgPSBzdGQ6Om1ha2VfdW5pcXVlPEF1ZGlvRGV2aWNlSURbXT4obnVtYmVy RGV2aWNlcyk7CisgICBBdWRpb0J1ZmZlckxpc3QqIGJ1ZmZlckxpc3QgPSBOVUxMOworICAgVUlu dDMyIG51bWJlclNjb3BlZERldmljZXMgPSAwOworIAorQEAgLTE1OTcsNyArMTU5OCw3IEBAIGlu dDMyX3QgQXVkaW9EZXZpY2VNYWM6OkdldE51bWJlckRldmljZXMoY29uc3QgQXVkaW9PYmplY3RQ cm9wZXJ0eVNjb3BlIHNjb3BlLAorICAgYm9vbCBsaXN0T0sgPSB0cnVlOworIAorICAgV0VCUlRD X0NBX0xPR19FUlIoQXVkaW9PYmplY3RHZXRQcm9wZXJ0eURhdGEoCistICAgICAga0F1ZGlvT2Jq ZWN0U3lzdGVtT2JqZWN0LCAmcHJvcGVydHlBZGRyZXNzLCAwLCBOVUxMLCAmc2l6ZSwgZGV2aWNl SWRzKSk7CisrICAgICAga0F1ZGlvT2JqZWN0U3lzdGVtT2JqZWN0LCAmcHJvcGVydHlBZGRyZXNz LCAwLCBOVUxMLCAmc2l6ZSwgZGV2aWNlSWRzLmdldCgpKSk7CisgICBpZiAoZXJyICE9IG5vRXJy KSB7CisgICAgIGxpc3RPSyA9IGZhbHNlOworICAgfSBlbHNlIHsKK0BAIC0xNjQxLDExICsxNjQy LDYgQEAgaW50MzJfdCBBdWRpb0RldmljZU1hYzo6R2V0TnVtYmVyRGV2aWNlcyhjb25zdCBBdWRp b09iamVjdFByb3BlcnR5U2NvcGUgc2NvcGUsCisgICB9CisgCisgICBpZiAoIWxpc3RPSykgewor LSAgICBpZiAoZGV2aWNlSWRzKSB7CistICAgICAgZnJlZShkZXZpY2VJZHMpOworLSAgICAgIGRl dmljZUlkcyA9IE5VTEw7CistICAgIH0KKy0KKyAgICAgaWYgKGJ1ZmZlckxpc3QpIHsKKyAgICAg ICBmcmVlKGJ1ZmZlckxpc3QpOworICAgICAgIGJ1ZmZlckxpc3QgPSBOVUxMOworQEAgLTE2NTQs MTIgKzE2NTAsNiBAQCBpbnQzMl90IEF1ZGlvRGV2aWNlTWFjOjpHZXROdW1iZXJEZXZpY2VzKGNv bnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29wZSBzY29wZSwKKyAgICAgcmV0dXJuIC0xOworICAg fQorIAorLSAgLy8gSGFwcHkgZW5kaW5nCistICBpZiAoZGV2aWNlSWRzKSB7CistICAgIGZyZWUo ZGV2aWNlSWRzKTsKKy0gICAgZGV2aWNlSWRzID0gTlVMTDsKKy0gIH0KKy0KKyAgIHJldHVybiBu dW1iZXJTY29wZWREZXZpY2VzOworIH0KKyAK 341684 2018-05-31 12:11:24 -0700 2018-05-31 12:51:35 -0700 Patch v3 bug-186152-20180531121123.patch text/plain 5659 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCBlMThiYzVhMzIyMWM4N2Y3MGVhYThiYTJjNWM4OWVlNTBjZmJlY2MyLi5jMTgz YmRjNDM0NDNmNTVjOTI5ZjM4ZDFjZTA4YTI2YzVlY2Y2YjU3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNS0zMSAgRGF2aWQgS2ls emVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBsZWFrIG9mIEF1ZGlvRGV2 aWNlSUQgYXJyYXkgZHVlIHRvIGFuIGVhcmx5IHJldHVybiBpbiBBdWRpb0RldmljZU1hYzo6R2V0 TnVtYmVyRGV2aWNlcygpCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xODYxNTI+Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MDY5MjgyND4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19k ZXZpY2UvbWFjL2F1ZGlvX2RldmljZV9tYWMuY2M6CisgICAgICAgIFVzZSBzdGQ6Om1ha2VfdW5p cXVlPD4gc28gdGhhdCBtZW1vcnkgaXMgYWxsb2NhdGVkIGFuZAorICAgICAgICBkZWFsbG9jYXRl ZCBhdXRvbWF0aWNhbGx5LiAgUmVtb3ZlIG1hbnVhbCBjYWxscyB0byBmcmVlKCkuCisgICAgICAg ICogV2ViS2l0LzAwMTEtRml4LUF1ZGlvRGV2aWNlSUQtYXJyYXktbGVhay5wYXRjaDogQWRkLgor CiAyMDE4LTA1LTMwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAg ICAgRml4IGxlYWsgb2YgYSBDVlBpeGVsQnVmZmVyUmVmIGR1ZSB0byBlYXJseSByZXJ0dXJuIGlu IC1bUlRDVmlkZW9FbmNvZGVySDI2NCBlbmNvZGU6Y29kZWNTcGVjaWZpY0luZm86ZnJhbWVUeXBl czpdCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0 Yy9tb2R1bGVzL2F1ZGlvX2RldmljZS9tYWMvYXVkaW9fZGV2aWNlX21hYy5jYyBiL1NvdXJjZS9U aGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVsZXMvYXVkaW9fZGV2aWNlL21h Yy9hdWRpb19kZXZpY2VfbWFjLmNjCmluZGV4IGM1ODVjMzJjYWZjMzBmNDBjMmRkMDBiYzkwOTY0 OTg3NmRhMjBkNmEuLjg5ZWE5MzE3YzFmYmQxNjY3NDI1NmE4NWM2ZmMxYzU1NDJiNTNiZjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVs ZXMvYXVkaW9fZGV2aWNlL21hYy9hdWRpb19kZXZpY2VfbWFjLmNjCisrKyBiL1NvdXJjZS9UaGly ZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVsZXMvYXVkaW9fZGV2aWNlL21hYy9h dWRpb19kZXZpY2VfbWFjLmNjCkBAIC0xOSw2ICsxOSw3IEBACiAjaW5jbHVkZSA8QXBwbGljYXRp b25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CiAjaW5jbHVkZSA8bGlia2Vybi9PU0F0 b21pYy5oPiAgLy8gT1NBdG9taWNDb21wYXJlQW5kU3dhcCgpCiAjaW5jbHVkZSA8bWFjaC9tYWNo Lmg+ICAgICAgICAgLy8gbWFjaF90YXNrX3NlbGYoKQorI2luY2x1ZGUgPG1lbW9yeT4gICAgICAg ICAgICAgIC8vIHN0ZDo6bWFrZV91bmlxdWU8PigpIGFuZCBzdGQ6OnVuaXF1ZV9wdHI8PigpCiAj aW5jbHVkZSA8c3lzL3N5c2N0bC5oPiAgICAgICAgLy8gc3lzY3RsYnluYW1lKCkKIAogbmFtZXNw YWNlIHdlYnJ0YyB7CkBAIC0xNTY0LDggKzE1NjUsOCBAQCBpbnQzMl90IEF1ZGlvRGV2aWNlTWFj OjpHZXROdW1iZXJEZXZpY2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29wZSBzY29wZSwK ICAgICByZXR1cm4gMDsKICAgfQogCi0gIEF1ZGlvRGV2aWNlSUQqIGRldmljZUlkcyA9IChBdWRp b0RldmljZUlEKiltYWxsb2Moc2l6ZSk7CiAgIFVJbnQzMiBudW1iZXJEZXZpY2VzID0gc2l6ZSAv IHNpemVvZihBdWRpb0RldmljZUlEKTsKKyAgYXV0byBkZXZpY2VJZHMgPSBzdGQ6Om1ha2VfdW5p cXVlPEF1ZGlvRGV2aWNlSURbXT4obnVtYmVyRGV2aWNlcyk7CiAgIEF1ZGlvQnVmZmVyTGlzdCog YnVmZmVyTGlzdCA9IE5VTEw7CiAgIFVJbnQzMiBudW1iZXJTY29wZWREZXZpY2VzID0gMDsKIApA QCAtMTU5Nyw3ICsxNTk4LDcgQEAgaW50MzJfdCBBdWRpb0RldmljZU1hYzo6R2V0TnVtYmVyRGV2 aWNlcyhjb25zdCBBdWRpb09iamVjdFByb3BlcnR5U2NvcGUgc2NvcGUsCiAgIGJvb2wgbGlzdE9L ID0gdHJ1ZTsKIAogICBXRUJSVENfQ0FfTE9HX0VSUihBdWRpb09iamVjdEdldFByb3BlcnR5RGF0 YSgKLSAgICAgIGtBdWRpb09iamVjdFN5c3RlbU9iamVjdCwgJnByb3BlcnR5QWRkcmVzcywgMCwg TlVMTCwgJnNpemUsIGRldmljZUlkcykpOworICAgICAga0F1ZGlvT2JqZWN0U3lzdGVtT2JqZWN0 LCAmcHJvcGVydHlBZGRyZXNzLCAwLCBOVUxMLCAmc2l6ZSwgZGV2aWNlSWRzLmdldCgpKSk7CiAg IGlmIChlcnIgIT0gbm9FcnIpIHsKICAgICBsaXN0T0sgPSBmYWxzZTsKICAgfSBlbHNlIHsKQEAg LTE2NDEsMTEgKzE2NDIsNiBAQCBpbnQzMl90IEF1ZGlvRGV2aWNlTWFjOjpHZXROdW1iZXJEZXZp Y2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29wZSBzY29wZSwKICAgfQogCiAgIGlmICgh bGlzdE9LKSB7Ci0gICAgaWYgKGRldmljZUlkcykgewotICAgICAgZnJlZShkZXZpY2VJZHMpOwot ICAgICAgZGV2aWNlSWRzID0gTlVMTDsKLSAgICB9Ci0KICAgICBpZiAoYnVmZmVyTGlzdCkgewog ICAgICAgZnJlZShidWZmZXJMaXN0KTsKICAgICAgIGJ1ZmZlckxpc3QgPSBOVUxMOwpAQCAtMTY1 NCwxMiArMTY1MCw2IEBAIGludDMyX3QgQXVkaW9EZXZpY2VNYWM6OkdldE51bWJlckRldmljZXMo Y29uc3QgQXVkaW9PYmplY3RQcm9wZXJ0eVNjb3BlIHNjb3BlLAogICAgIHJldHVybiAtMTsKICAg fQogCi0gIC8vIEhhcHB5IGVuZGluZwotICBpZiAoZGV2aWNlSWRzKSB7Ci0gICAgZnJlZShkZXZp Y2VJZHMpOwotICAgIGRldmljZUlkcyA9IE5VTEw7Ci0gIH0KLQogICByZXR1cm4gbnVtYmVyU2Nv cGVkRGV2aWNlczsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRj L1dlYktpdC8wMDExLUZpeC1BdWRpb0RldmljZUlELWFycmF5LWxlYWsucGF0Y2ggYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvV2ViS2l0LzAwMTEtRml4LUF1ZGlvRGV2aWNlSUQtYXJyYXkt bGVhay5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wYmVkN2Y0OGI2YzY0MzJkOWRjYTM0NDQ3NTdkMDhhNGFh MDk3YjUxCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1dl YktpdC8wMDExLUZpeC1BdWRpb0RldmljZUlELWFycmF5LWxlYWsucGF0Y2gKQEAgLTAsMCArMSw1 NiBAQAorZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2Vi cnRjL21vZHVsZXMvYXVkaW9fZGV2aWNlL21hYy9hdWRpb19kZXZpY2VfbWFjLmNjIGIvU291cmNl L1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9hdWRpb19kZXZpY2Uv bWFjL2F1ZGlvX2RldmljZV9tYWMuY2MKK2luZGV4IGM1ODVjMzJjYWZjLi44OWVhOTMxN2MxZiAx MDA2NDQKKy0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21v ZHVsZXMvYXVkaW9fZGV2aWNlL21hYy9hdWRpb19kZXZpY2VfbWFjLmNjCisrKysgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tb2R1bGVzL2F1ZGlvX2RldmljZS9t YWMvYXVkaW9fZGV2aWNlX21hYy5jYworQEAgLTE5LDYgKzE5LDcgQEAKKyAjaW5jbHVkZSA8QXBw bGljYXRpb25TZXJ2aWNlcy9BcHBsaWNhdGlvblNlcnZpY2VzLmg+CisgI2luY2x1ZGUgPGxpYmtl cm4vT1NBdG9taWMuaD4gIC8vIE9TQXRvbWljQ29tcGFyZUFuZFN3YXAoKQorICNpbmNsdWRlIDxt YWNoL21hY2guaD4gICAgICAgICAvLyBtYWNoX3Rhc2tfc2VsZigpCisrI2luY2x1ZGUgPG1lbW9y eT4gICAgICAgICAgICAgIC8vIHN0ZDo6bWFrZV91bmlxdWU8PigpIGFuZCBzdGQ6OnVuaXF1ZV9w dHI8PigpCisgI2luY2x1ZGUgPHN5cy9zeXNjdGwuaD4gICAgICAgIC8vIHN5c2N0bGJ5bmFtZSgp CisgCisgbmFtZXNwYWNlIHdlYnJ0YyB7CitAQCAtMTU2NCw4ICsxNTY1LDggQEAgaW50MzJfdCBB dWRpb0RldmljZU1hYzo6R2V0TnVtYmVyRGV2aWNlcyhjb25zdCBBdWRpb09iamVjdFByb3BlcnR5 U2NvcGUgc2NvcGUsCisgICAgIHJldHVybiAwOworICAgfQorIAorLSAgQXVkaW9EZXZpY2VJRCog ZGV2aWNlSWRzID0gKEF1ZGlvRGV2aWNlSUQqKW1hbGxvYyhzaXplKTsKKyAgIFVJbnQzMiBudW1i ZXJEZXZpY2VzID0gc2l6ZSAvIHNpemVvZihBdWRpb0RldmljZUlEKTsKKysgIGF1dG8gZGV2aWNl SWRzID0gc3RkOjptYWtlX3VuaXF1ZTxBdWRpb0RldmljZUlEW10+KG51bWJlckRldmljZXMpOwor ICAgQXVkaW9CdWZmZXJMaXN0KiBidWZmZXJMaXN0ID0gTlVMTDsKKyAgIFVJbnQzMiBudW1iZXJT Y29wZWREZXZpY2VzID0gMDsKKyAKK0BAIC0xNTk3LDcgKzE1OTgsNyBAQCBpbnQzMl90IEF1ZGlv RGV2aWNlTWFjOjpHZXROdW1iZXJEZXZpY2VzKGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlTY29w ZSBzY29wZSwKKyAgIGJvb2wgbGlzdE9LID0gdHJ1ZTsKKyAKKyAgIFdFQlJUQ19DQV9MT0dfRVJS KEF1ZGlvT2JqZWN0R2V0UHJvcGVydHlEYXRhKAorLSAgICAgIGtBdWRpb09iamVjdFN5c3RlbU9i amVjdCwgJnByb3BlcnR5QWRkcmVzcywgMCwgTlVMTCwgJnNpemUsIGRldmljZUlkcykpOworKyAg ICAgIGtBdWRpb09iamVjdFN5c3RlbU9iamVjdCwgJnByb3BlcnR5QWRkcmVzcywgMCwgTlVMTCwg JnNpemUsIGRldmljZUlkcy5nZXQoKSkpOworICAgaWYgKGVyciAhPSBub0VycikgeworICAgICBs aXN0T0sgPSBmYWxzZTsKKyAgIH0gZWxzZSB7CitAQCAtMTY0MSwxMSArMTY0Miw2IEBAIGludDMy X3QgQXVkaW9EZXZpY2VNYWM6OkdldE51bWJlckRldmljZXMoY29uc3QgQXVkaW9PYmplY3RQcm9w ZXJ0eVNjb3BlIHNjb3BlLAorICAgfQorIAorICAgaWYgKCFsaXN0T0spIHsKKy0gICAgaWYgKGRl dmljZUlkcykgeworLSAgICAgIGZyZWUoZGV2aWNlSWRzKTsKKy0gICAgICBkZXZpY2VJZHMgPSBO VUxMOworLSAgICB9CistCisgICAgIGlmIChidWZmZXJMaXN0KSB7CisgICAgICAgZnJlZShidWZm ZXJMaXN0KTsKKyAgICAgICBidWZmZXJMaXN0ID0gTlVMTDsKK0BAIC0xNjU0LDEyICsxNjUwLDYg QEAgaW50MzJfdCBBdWRpb0RldmljZU1hYzo6R2V0TnVtYmVyRGV2aWNlcyhjb25zdCBBdWRpb09i amVjdFByb3BlcnR5U2NvcGUgc2NvcGUsCisgICAgIHJldHVybiAtMTsKKyAgIH0KKyAKKy0gIC8v IEhhcHB5IGVuZGluZworLSAgaWYgKGRldmljZUlkcykgeworLSAgICBmcmVlKGRldmljZUlkcyk7 CistICAgIGRldmljZUlkcyA9IE5VTEw7CistICB9CistCisgICByZXR1cm4gbnVtYmVyU2NvcGVk RGV2aWNlczsKKyB9CisgCg==