227239 2021-06-21 15:43:38 -0700 Guard against compile failures of the default libraries 2021-06-23 23:51:24 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kpiddington kpiddington dino ews-watchlist kbr kkinnunen kondapallykalyan webkit-bug-importer oldest_to_newest 1771498 0 kpiddington 2021-06-21 15:43:38 -0700 Guard against compile failures of the default libraries 1771500 1 431920 kpiddington 2021-06-21 15:47:03 -0700 Created attachment 431920 Patch 1771501 2 kpiddington 2021-06-21 15:47:05 -0700 <rdar://problem/79037623> 1771502 3 ews-watchlist 2021-06-21 15:48:22 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1772196 4 ews-feeder 2021-06-23 23:51:23 -0700 Committed r279212 (239098@main): <https://commits.webkit.org/239098@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431920. 431920 2021-06-21 15:47:03 -0700 2021-06-23 23:51:23 -0700 Patch bug-227239-20210621154702.patch text/plain 10670 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNTFiNzNiMzNjYWEwNWMwNWMxYzZlYWUyMzc2ODc1NTU1MDFhOTI5Mi4uODllYWQ1NmMzZGMy ODg0N2VkZTgxNDM5NWI5MGI1MWMwNjk4ZDI3YiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA2LTIxICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgR3VhcmQgYWdhaW5zdCBjb21waWxlIGZhaWx1cmVz IG9mIHRoZSBkZWZhdWx0IGxpYnJhcmllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MjM5CisgICAgICAgIDxyZGFyOi8vNzkwMzc2MjM+CisKKyAg ICAgICAgVW5kZXIgY2VydGFpbiBldmVudHMgKEhpZ2ggbWVtb3J5IHVzYWdlKSwgdGhlIE1UTENv bXBpbGVyU2VydmljZSBjYW4gZmFpbCB3aGVuIGNyZWF0aW5nIHRoZSBkZWZhdWx0IGxpYnJhcnku CisgICAgICAgIEd1YXJkIGFnYWluc3QgbmlsIHBpcGVsaW5lcyBieSBmYWlsaW5nIEdMIGNhbGxz IGluc3RlYWQsIGlmIHRoaXMgaGFwcGVucy4gV2hpbGUgdGhpcyBjYW4gY3JlYXRlIHJlbmRlcmlu ZyBhcnRpZmFjdHMKKyAgICAgICAgZHVlIHRvIG1pc3NpbmcgYmxpdHMgLyBjb252ZXJzaW9ucywg dGhpcyBjYW4gYXQgbGVhc3QgYXZvaWQgY3Jhc2hpbmcgdGhlIHByb2Nlc3MuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5oOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9y ZW5kZXJlci9tZXRhbC9tdGxfcmVuZGVyX3V0aWxzLm1tOgorICAgICAgICAocng6Om10bDo6Q2xl YXJVdGlsczo6c2V0dXBDbGVhcldpdGhEcmF3KToKKyAgICAgICAgKHJ4OjptdGw6OkNsZWFyVXRp bHM6OmNsZWFyV2l0aERyYXcpOgorICAgICAgICAocng6Om10bDo6Q29sb3JCbGl0VXRpbHM6OnNl dHVwQ29sb3JCbGl0V2l0aERyYXcpOgorICAgICAgICAocng6Om10bDo6Q29sb3JCbGl0VXRpbHM6 OmJsaXRDb2xvcldpdGhEcmF3KToKKyAgICAgICAgKHJ4OjptdGw6OkRlcHRoU3RlbmNpbEJsaXRV dGlsczo6c2V0dXBEZXB0aFN0ZW5jaWxCbGl0V2l0aERyYXcpOgorICAgICAgICAocng6Om10bDo6 RGVwdGhTdGVuY2lsQmxpdFV0aWxzOjpibGl0RGVwdGhTdGVuY2lsV2l0aERyYXcpOgorICAgICAg ICAocng6Om10bDo6VmVydGV4Rm9ybWF0Q29udmVyc2lvblV0aWxzOjpzZXR1cENvbW1vbkNvbnZl cnRWZXJ0ZXhGb3JtYXRUb0Zsb2F0KToKKyAgICAgICAgKHJ4OjptdGw6OlZlcnRleEZvcm1hdENv bnZlcnNpb25VdGlsczo6ZXhwYW5kVmVydGV4Rm9ybWF0Q29tcG9uZW50c1ZTKToKKyAgICAgICAg KHJ4OjptdGw6OlZlcnRleEZvcm1hdENvbnZlcnNpb25VdGlsczo6c2V0dXBDb21tb25FeHBhbmRW ZXJ0ZXhGb3JtYXRDb21wb25lbnRzKToKKwogMjAyMS0wNi0xNyAgS3lsZSBQaWRkaW5ndG9uICA8 a3BpZGRpbmd0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNZXRhbCBBTkdMRV0gU2hhZGVycyB3 aXRoIHJlc2VydmVkIG1ldGFsIGtleXdvcmRzIGRvIG5vdCB0cmFuc2xhdGUsIG5vciBkbyBzaGFk ZXJzIHdpdGggc3RydWN0IGFuZCB2YXJpYWJsZSBuYW1lcyB0aGF0IGFyZSB0aGUgc2FtZSBleGNl cHQgcHJlZml4ZWQgYnkgYW4gdW5kZXJzY29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9yZW5kZXJfdXRpbHMuaCBi L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxf cmVuZGVyX3V0aWxzLmgKaW5kZXggZDBhNDgzNzE4ZmUwNTQ0ZGI1N2RmZTllZWVlYjNjN2I0OGU0 YmEyNi4uYjYwZmNlNzE0YjVkNjdmOWY0MmI4ODcyZmI4YWYyODMwMGMwMDc5ZSAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210 bF9yZW5kZXJfdXRpbHMuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5oCkBAIC0yMDAsNyArMjAwLDcgQEAg Y2xhc3MgQ2xlYXJVdGlscyBmaW5hbCA6IGFuZ2xlOjpOb25Db3B5YWJsZQogICBwcml2YXRlOgog ICAgIHZvaWQgZW5zdXJlUmVuZGVyUGlwZWxpbmVTdGF0ZUNhY2hlSW5pdGlhbGl6ZWQoQ29udGV4 dE10bCAqY3R4LCB1aW50MzJfdCBudW1Db2xvckF0dGFjaG1lbnRzKTsKIAotICAgIHZvaWQgc2V0 dXBDbGVhcldpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAorICAgIGFuZ2xlOjpS ZXN1bHQgc2V0dXBDbGVhcldpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFJlbmRlckNvbW1hbmRFbmNvZGVyICpjbWRFbmNvZGVy LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IENsZWFyUmVjdFBhcmFtcyAmcGFy YW1zKTsKICAgICBpZDxNVExEZXB0aFN0ZW5jaWxTdGF0ZT4gZ2V0Q2xlYXJEZXB0aFN0ZW5jaWxT dGF0ZShjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKQEAgLTIzNiw3ICsyMzYsNyBAQCBjbGFz cyBDb2xvckJsaXRVdGlscyBmaW5hbCA6IGFuZ2xlOjpOb25Db3B5YWJsZQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHNvdXJjZVRleHR1cmVU eXBlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UmVuZGVyUGlwZWxpbmVDYWNoZSAqY2FjaGVPdXQpOwogCi0gICAgdm9pZCBzZXR1cENvbG9yQmxp dFdpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAorICAgIGFuZ2xlOjpSZXN1bHQg c2V0dXBDb2xvckJsaXRXaXRoRHJhdyhjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUmVuZGVyQ29tbWFuZEVuY29kZXIgKmNtZEVuY29k ZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IENvbG9yQmxpdFBhcmFt cyAmcGFyYW1zKTsKIApAQCAtMjgwLDcgKzI4MCw3IEBAIGNsYXNzIERlcHRoU3RlbmNpbEJsaXRV dGlscyBmaW5hbCA6IGFuZ2xlOjpOb25Db3B5YWJsZQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHNvdXJjZVN0ZW5jaWxUZXh0dXJlVHlwZSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJlbmRl clBpcGVsaW5lQ2FjaGUgKmNhY2hlT3V0KTsKIAotICAgIHZvaWQgc2V0dXBEZXB0aFN0ZW5jaWxC bGl0V2l0aERyYXcoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCisgICAgYW5nbGU6OlJlc3Vs dCBzZXR1cERlcHRoU3RlbmNpbEJsaXRXaXRoRHJhdyhjb25zdCBnbDo6Q29udGV4dCAqY29udGV4 dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJlbmRlckNvbW1hbmRF bmNvZGVyICpjbWRFbmNvZGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgRGVwdGhTdGVuY2lsQmxpdFBhcmFtcyAmcGFyYW1zKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9y ZW5kZXJfdXRpbHMubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5tbQppbmRleCA0ZTM5MjIwYWVjOGYwM2E4NjBj NzRmMWVkMzZhZmU3YTM0MzE2ZTdhLi43ODdlMTcyYWZkZWFlYTVjODI1NzdmNTFjNDIzNGVkMDQ0 MDg4MmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5tbQpA QCAtMTMzMywxMyArMTMzMywxOCBAQCBpZDxNVExSZW5kZXJQaXBlbGluZVN0YXRlPiBDbGVhclV0 aWxzOjpnZXRDbGVhclJlbmRlclBpcGVsaW5lU3RhdGUoY29uc3QgZ2w6OkNvbgogICAgIHJldHVy biBjYWNoZS5nZXRSZW5kZXJQaXBlbGluZVN0YXRlKGNvbnRleHRNdGwsIHBpcGVsaW5lRGVzYyk7 CiB9CiAKLXZvaWQgQ2xlYXJVdGlsczo6c2V0dXBDbGVhcldpdGhEcmF3KGNvbnN0IGdsOjpDb250 ZXh0ICpjb250ZXh0LAorYW5nbGU6OlJlc3VsdCBDbGVhclV0aWxzOjpzZXR1cENsZWFyV2l0aERy YXcoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBSZW5kZXJDb21tYW5kRW5jb2RlciAqY21kRW5jb2RlciwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IENsZWFyUmVjdFBhcmFtcyAmcGFyYW1zKQog ewogICAgIC8vIEdlbmVyYXRlIHJlbmRlciBwaXBlbGluZSBzdGF0ZQogICAgIGlkPE1UTFJlbmRl clBpcGVsaW5lU3RhdGU+IHJlbmRlclBpcGVsaW5lU3RhdGUgPQogICAgICAgICBnZXRDbGVhclJl bmRlclBpcGVsaW5lU3RhdGUoY29udGV4dCwgY21kRW5jb2RlciwgcGFyYW1zKTsKKyAgICBpZihy ZW5kZXJQaXBlbGluZVN0YXRlID09IG5pbCkKKyAgICB7CisgICAgICAgIC8vUmV0dXJuIGVhcmx5 CisgICAgICAgIHJldHVybiBhbmdsZTo6UmVzdWx0OjpTdG9wOworICAgIH0KICAgICBBU1NFUlQo cmVuZGVyUGlwZWxpbmVTdGF0ZSk7CiAgICAgLy8gU2V0dXAgc3RhdGVzCiAgICAgU2V0dXBGdWxs c2NyZWVuUXVhZERyYXdDb21tb25TdGF0ZXMoY21kRW5jb2Rlcik7CkBAIC0xMzczLDYgKzEzNzgs NyBAQCB2b2lkIENsZWFyVXRpbHM6OnNldHVwQ2xlYXJXaXRoRHJhdyhjb25zdCBnbDo6Q29udGV4 dCAqY29udGV4dCwKIAogICAgIGNtZEVuY29kZXItPnNldFZlcnRleERhdGEodW5pZm9ybVBhcmFt cywgMCk7CiAgICAgY21kRW5jb2Rlci0+c2V0RnJhZ21lbnREYXRhKHVuaWZvcm1QYXJhbXMsIDAp OworICAgIHJldHVybiBhbmdsZTo6UmVzdWx0OjpDb250aW51ZTsKIH0KIAogYW5nbGU6OlJlc3Vs dCBDbGVhclV0aWxzOjpjbGVhcldpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LApA QCAtMTQwMSw3ICsxNDA3LDcgQEAgYW5nbGU6OlJlc3VsdCBDbGVhclV0aWxzOjpjbGVhcldpdGhE cmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogICAgICAgICByZXR1cm4gYW5nbGU6OlJl c3VsdDo6Q29udGludWU7CiAgICAgfQogICAgIENvbnRleHRNdGwgKmNvbnRleHRNdGwgPSBHZXRJ bXBsKGNvbnRleHQpOwotICAgIHNldHVwQ2xlYXJXaXRoRHJhdyhjb250ZXh0LCBjbWRFbmNvZGVy LCBvdmVycmlkZWRQYXJhbXMpOworICAgIEFOR0xFX1RSWShzZXR1cENsZWFyV2l0aERyYXcoY29u dGV4dCwgY21kRW5jb2Rlciwgb3ZlcnJpZGVkUGFyYW1zKSk7CiAKICAgICBhbmdsZTo6UmVzdWx0 IHJlc3VsdDsKICAgICB7CkBAIC0xNTM3LDcgKzE1NDMsNyBAQCBpZDxNVExSZW5kZXJQaXBlbGlu ZVN0YXRlPiBDb2xvckJsaXRVdGlsczo6Z2V0Q29sb3JCbGl0UmVuZGVyUGlwZWxpbmVTdGF0ZSgK ICAgICByZXR1cm4gcGlwZWxpbmVDYWNoZS0+Z2V0UmVuZGVyUGlwZWxpbmVTdGF0ZShjb250ZXh0 TXRsLCBwaXBlbGluZURlc2MpOwogfQogCi12b2lkIENvbG9yQmxpdFV0aWxzOjpzZXR1cENvbG9y QmxpdFdpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAorYW5nbGU6OlJlc3VsdCBD b2xvckJsaXRVdGlsczo6c2V0dXBDb2xvckJsaXRXaXRoRHJhdyhjb25zdCBnbDo6Q29udGV4dCAq Y29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUmVu ZGVyQ29tbWFuZEVuY29kZXIgKmNtZEVuY29kZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IENvbG9yQmxpdFBhcmFtcyAmcGFyYW1zKQogewpAQCAt MTU0OSw2ICsxNTU1LDExIEBAIHZvaWQgQ29sb3JCbGl0VXRpbHM6OnNldHVwQ29sb3JCbGl0V2l0 aERyYXcoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgaWQ8TVRMUmVuZGVyUGlwZWxp bmVTdGF0ZT4gcmVuZGVyUGlwZWxpbmVTdGF0ZSA9CiAgICAgICAgIGdldENvbG9yQmxpdFJlbmRl clBpcGVsaW5lU3RhdGUoY29udGV4dCwgY21kRW5jb2RlciwgcGFyYW1zKTsKICAgICBBU1NFUlQo cmVuZGVyUGlwZWxpbmVTdGF0ZSk7CisgICAgaWYoIXJlbmRlclBpcGVsaW5lU3RhdGUpCisgICAg eworICAgICAgICAvL3JldHVybiBlYXJseQorICAgICAgICByZXR1cm4gYW5nbGU6OlJlc3VsdDo6 U3RvcDsKKyAgICB9CiAgICAgLy8gU2V0dXAgc3RhdGVzCiAgICAgY21kRW5jb2Rlci0+c2V0UmVu ZGVyUGlwZWxpbmVTdGF0ZShyZW5kZXJQaXBlbGluZVN0YXRlKTsKICAgICBjbWRFbmNvZGVyLT5z ZXREZXB0aFN0ZW5jaWxTdGF0ZSgKQEAgLTE1NjQsNiArMTU3NSw3IEBAIHZvaWQgQ29sb3JCbGl0 VXRpbHM6OnNldHVwQ29sb3JCbGl0V2l0aERyYXcoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQs CiAgICAgY21kRW5jb2Rlci0+c2V0RnJhZ21lbnRTYW1wbGVyU3RhdGUoY29udGV4dE10bC0+Z2V0 RGlzcGxheSgpLT5nZXRTdGF0ZUNhY2hlKCkuZ2V0U2FtcGxlclN0YXRlKAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0TXRsLT5nZXRNZXRhbERldmlj ZSgpLCBzYW1wbGVyRGVzYyksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgMCwgRkxUX01BWCwgMCk7CisgICAgcmV0dXJuIGFuZ2xlOjpSZXN1bHQ6OkNvbnRpbnVlOwog fQogCiBhbmdsZTo6UmVzdWx0IENvbG9yQmxpdFV0aWxzOjpibGl0Q29sb3JXaXRoRHJhdyhjb25z dCBnbDo6Q29udGV4dCAqY29udGV4dCwKQEAgLTE1NzUsNyArMTU4Nyw3IEBAIGFuZ2xlOjpSZXN1 bHQgQ29sb3JCbGl0VXRpbHM6OmJsaXRDb2xvcldpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpj b250ZXh0LAogICAgICAgICByZXR1cm4gYW5nbGU6OlJlc3VsdDo6Q29udGludWU7CiAgICAgfQog ICAgIENvbnRleHRNdGwgKmNvbnRleHRNdGwgPSBHZXRJbXBsKGNvbnRleHQpOwotICAgIHNldHVw Q29sb3JCbGl0V2l0aERyYXcoY29udGV4dCwgY21kRW5jb2RlciwgcGFyYW1zKTsKKyAgICBBTkdM RV9UUlkoc2V0dXBDb2xvckJsaXRXaXRoRHJhdyhjb250ZXh0LCBjbWRFbmNvZGVyLCBwYXJhbXMp KTsKIAogICAgIGFuZ2xlOjpSZXN1bHQgcmVzdWx0OwogICAgIHsKQEAgLTE3MzAsNyArMTc0Miw3 IEBAIGlkPE1UTFJlbmRlclBpcGVsaW5lU3RhdGU+IERlcHRoU3RlbmNpbEJsaXRVdGlsczo6Z2V0 RGVwdGhTdGVuY2lsQmxpdFJlbmRlclBpcGVsCiAgICAgcmV0dXJuIHBpcGVsaW5lQ2FjaGUtPmdl dFJlbmRlclBpcGVsaW5lU3RhdGUoY29udGV4dE10bCwgcGlwZWxpbmVEZXNjKTsKIH0KIAotdm9p ZCBEZXB0aFN0ZW5jaWxCbGl0VXRpbHM6OnNldHVwRGVwdGhTdGVuY2lsQmxpdFdpdGhEcmF3KGNv bnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAorYW5nbGU6OlJlc3VsdCBEZXB0aFN0ZW5jaWxCbGl0 VXRpbHM6OnNldHVwRGVwdGhTdGVuY2lsQmxpdFdpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpj b250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFJlbmRlckNvbW1hbmRFbmNvZGVyICpjbWRFbmNvZGVyLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IERlcHRo U3RlbmNpbEJsaXRQYXJhbXMgJnBhcmFtcykKIHsKQEAgLTE3NDMsNiArMTc1NSwxMCBAQCB2b2lk IERlcHRoU3RlbmNpbEJsaXRVdGlsczo6c2V0dXBEZXB0aFN0ZW5jaWxCbGl0V2l0aERyYXcoY29u c3QgZ2w6OkNvbnRleHQgKmNvbgogICAgIC8vIEdlbmVyYXRlIHJlbmRlciBwaXBlbGluZSBzdGF0 ZQogICAgIGlkPE1UTFJlbmRlclBpcGVsaW5lU3RhdGU+IHJlbmRlclBpcGVsaW5lU3RhdGUgPQog ICAgICAgICBnZXREZXB0aFN0ZW5jaWxCbGl0UmVuZGVyUGlwZWxpbmVTdGF0ZShjb250ZXh0LCBj bWRFbmNvZGVyLCBwYXJhbXMpOworICAgIGlmKCFyZW5kZXJQaXBlbGluZVN0YXRlKQorICAgIHsK KyAgICAgICAgcmV0dXJuIGFuZ2xlOjpSZXN1bHQ6OlN0b3A7CisgICAgfQogICAgIEFTU0VSVChy ZW5kZXJQaXBlbGluZVN0YXRlKTsKICAgICAvLyBTZXR1cCBzdGF0ZXMKICAgICBjbWRFbmNvZGVy LT5zZXRSZW5kZXJQaXBlbGluZVN0YXRlKHJlbmRlclBpcGVsaW5lU3RhdGUpOwpAQCAtMTc4NSw2 ICsxODAxLDcgQEAgdm9pZCBEZXB0aFN0ZW5jaWxCbGl0VXRpbHM6OnNldHVwRGVwdGhTdGVuY2ls QmxpdFdpdGhEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb24KIAogICAgIGNtZEVuY29kZXItPnNl dERlcHRoU3RlbmNpbFN0YXRlKGNvbnRleHRNdGwtPmdldERpc3BsYXkoKS0+Z2V0U3RhdGVDYWNo ZSgpLmdldERlcHRoU3RlbmNpbFN0YXRlKAogICAgICAgICBjb250ZXh0TXRsLT5nZXRNZXRhbERl dmljZSgpLCBkc1N0YXRlRGVzYykpOworICAgIHJldHVybiBhbmdsZTo6UmVzdWx0OjpDb250aW51 ZTsKIH0KIAogYW5nbGU6OlJlc3VsdCBEZXB0aFN0ZW5jaWxCbGl0VXRpbHM6OmJsaXREZXB0aFN0 ZW5jaWxXaXRoRHJhdyhjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKQEAgLTE3OTcsNyArMTgx NCw3IEBAIGFuZ2xlOjpSZXN1bHQgRGVwdGhTdGVuY2lsQmxpdFV0aWxzOjpibGl0RGVwdGhTdGVu Y2lsV2l0aERyYXcoY29uc3QgZ2w6OkNvbnRleHQKICAgICB9CiAgICAgQ29udGV4dE10bCAqY29u dGV4dE10bCA9IEdldEltcGwoY29udGV4dCk7CiAKLSAgICBzZXR1cERlcHRoU3RlbmNpbEJsaXRX aXRoRHJhdyhjb250ZXh0LCBjbWRFbmNvZGVyLCBwYXJhbXMpOworICAgIEFOR0xFX1RSWShzZXR1 cERlcHRoU3RlbmNpbEJsaXRXaXRoRHJhdyhjb250ZXh0LCBjbWRFbmNvZGVyLCBwYXJhbXMpKTsK IAogICAgIGFuZ2xlOjpSZXN1bHQgcmVzdWx0OwogICAgIHsKQEAgLTI4NDQsNiArMjg2MSwxMCBA QCBhbmdsZTo6UmVzdWx0IFZlcnRleEZvcm1hdENvbnZlcnNpb25VdGlsczo6c2V0dXBDb21tb25D b252ZXJ0VmVydGV4Rm9ybWF0VG9GbG9hdAogICAgIGNvbnN0IGFuZ2xlOjpGb3JtYXQgJnNyY0Fu Z2xlRm9ybWF0LAogICAgIGNvbnN0IFZlcnRleEZvcm1hdENvbnZlcnRQYXJhbXMgJnBhcmFtcykK IHsKKyAgICBpZihwaXBlbGluZSA9PSBudWxscHRyKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFu Z2xlOjpSZXN1bHQ6OlN0b3A7CisgICAgfQogICAgIFNldFBpcGVsaW5lU3RhdGUoY21kRW5jb2Rl ciwgcGlwZWxpbmUpOwogICAgIFNldENvbXB1dGVPclZlcnRleEJ1ZmZlcihjbWRFbmNvZGVyLCBw YXJhbXMuc3JjQnVmZmVyLCAwLCAxKTsKICAgICBTZXRDb21wdXRlT3JWZXJ0ZXhCdWZmZXJGb3JX cml0ZShjbWRFbmNvZGVyLCBwYXJhbXMuZHN0QnVmZmVyLCAwLCAyKTsKQEAgLTI4OTIsNiArMjkx MywxMCBAQCBhbmdsZTo6UmVzdWx0IFZlcnRleEZvcm1hdENvbnZlcnNpb25VdGlsczo6ZXhwYW5k VmVydGV4Rm9ybWF0Q29tcG9uZW50c1ZTKAogCiAgICAgQXV0b09iakNQdHI8aWQ8TVRMUmVuZGVy UGlwZWxpbmVTdGF0ZT4+IHBpcGVsaW5lID0KICAgICAgICAgZ2V0Q29tcG9uZW50c0V4cGFuZFJl bmRlclBpcGVsaW5lKGNvbnRleHRNdGwsIGNtZEVuY29kZXIpOworICAgIGlmKHBpcGVsaW5lID09 IG51bGxwdHIpCisgICAgeworICAgICAgICByZXR1cm4gYW5nbGU6OlJlc3VsdDo6U3RvcDsKKyAg ICB9CiAKICAgICBBTkdMRV9UUlkoc2V0dXBDb21tb25FeHBhbmRWZXJ0ZXhGb3JtYXRDb21wb25l bnRzKGNvbnRleHRNdGwsIGNtZEVuY29kZXIsIHBpcGVsaW5lLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3JjQW5nbGVGb3JtYXQsIHBhcmFt cykpOwpAQCAtMjkxNSw2ICsyOTQwLDEwIEBAIGFuZ2xlOjpSZXN1bHQgVmVydGV4Rm9ybWF0Q29u dmVyc2lvblV0aWxzOjpzZXR1cENvbW1vbkV4cGFuZFZlcnRleEZvcm1hdENvbXBvbmVuCiAgICAg Y29uc3QgYW5nbGU6OkZvcm1hdCAmc3JjQW5nbGVGb3JtYXQsCiAgICAgY29uc3QgVmVydGV4Rm9y bWF0Q29udmVydFBhcmFtcyAmcGFyYW1zKQogeworICAgIGlmKHBpcGVsaW5lID09IG51bGxwdHIp CisgICAgeworICAgICAgICByZXR1cm4gYW5nbGU6OlJlc3VsdDo6U3RvcDsKKyAgICB9CiAgICAg U2V0UGlwZWxpbmVTdGF0ZShjbWRFbmNvZGVyLCBwaXBlbGluZSk7CiAgICAgU2V0Q29tcHV0ZU9y VmVydGV4QnVmZmVyKGNtZEVuY29kZXIsIHBhcmFtcy5zcmNCdWZmZXIsIDAsIDEpOwogICAgIFNl dENvbXB1dGVPclZlcnRleEJ1ZmZlckZvcldyaXRlKGNtZEVuY29kZXIsIHBhcmFtcy5kc3RCdWZm ZXIsIDAsIDIpOwo=