133430 2014-05-31 21:53:19 -0700 Web Replay: don't encode/decode primitive types that lack explicit sizes 2014-07-24 15:11:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 burg burg andersca commit-queue darin joepeck ossy timothy zsborbely.u-szeged oldest_to_newest 1012794 0 burg 2014-05-31 21:53:19 -0700 We currently serialize unsigned int and int fields for some C++ types and replay inputs. To reduce ambiguity as to what is being serialized, we should instead cast any such type to [u]int{32,64}_t and remove the specializations for unsigned int and int. 1013281 1 ossy 2014-06-04 03:00:19 -0700 *** Bug 133400 has been marked as a duplicate of this bug. *** 1014007 2 232675 burg 2014-06-07 21:15:03 -0700 Created attachment 232675 patch 1024475 3 ossy 2014-07-24 02:48:48 -0700 Anders, Darin, could you review this old patch, please? It is still needed to fix the web replay build on Linux. 1024628 4 232675 commit-queue 2014-07-24 15:11:36 -0700 Comment on attachment 232675 patch Clearing flags on attachment: 232675 Committed r171528: <http://trac.webkit.org/changeset/171528> 1024629 5 commit-queue 2014-07-24 15:11:41 -0700 All reviewed patches have been landed. Closing bug. 232675 2014-06-07 21:15:03 -0700 2014-07-24 15:11:36 -0700 patch bug-133430-20140607211433.patch text/plain 12474 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5Njc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZjhlNTgwZjA2NmY3OWU1ZDg1OTMzODBkMGJlYmI3MGU2Njc5YWE3Li5jZWYzZjg5ZmQ3ZmE4NWUy YWQ4MzZkZjVjMWFjYWQyM2JiYjJkYzYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxNC0wNi0wNyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIFJlcGxheTogZG9uJ3QgZW5jb2RlL2RlY29kZSBwcmltaXRp dmUgdHlwZXMgdGhhdCBsYWNrIGV4cGxpY2l0IHNpemVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM0MzAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBzdXBwb3J0IGVuY29kZS9kZWNvZGUgb2Yg dW5zaWduZWQgbG9uZywgc2luY2UgaXRzIHNpemUgaXMgY29tcGlsZXItZGVwZW5kZW50LgorCisg ICAgICAgICogcmVwbGF5L0VuY29kZWRWYWx1ZS5jcHA6CisgICAgICAgIChKU0M6OkVuY29kZWRW YWx1ZTo6Y29udmVydFRvPHVuc2lnbmVkIGxvbmc+KToKKyAgICAgICAgKEpTQzo6dW5zaWduZWQg bG9uZz46OmVuY29kZVZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKiByZXBsYXkvRW5jb2RlZFZh bHVlLmg6CisKIDIwMTQtMDYtMDYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgog CiAgICAgICAgIEluZGV4ZWQgZ2V0dGVycyBzaG91bGQgcmV0dXJuIHZhbHVlcyBkaXJlY3RseSBv biB0aGUgUHJvcGVydHlTbG90LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDA1MGQyOGUyMDQ2NTExYmJjMTRkNWI2 ZGFiYzlmNzgwNjFlZjY3MzguLmI1MDkwMDRiNDRmNGY2NzkxODI1NDE3NWJmMGNjNzM0ZGVjYzU4 NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNC0wNi0wNyAgQnJpYW4gSi4gQnVy ZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CisKKyAgICAgICAgV2ViIFJlcGxheTogZG9uJ3Qg ZW5jb2RlL2RlY29kZSBwcmltaXRpdmUgdHlwZXMgdGhhdCBsYWNrIGV4cGxpY2l0IHNpemVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM0MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdXNl cyBvZiB1bnNpZ25lZCBsb25nIGluIGVuY29kZS9kZWNvZGUgbWV0aG9kcyBiZWNhdXNlIHRoZSB0 eXBlIGxhY2tzIGFuCisgICAgICAgIGV4cGxpY2l0IHNpemUuIE1vdmUgZnJhbWUgaW5kZXggc2Vy aWFsaXphdGlvbiBhd2F5IGZyb20gdXNpbmcgdW5zaWduZWQgbG9uZy4KKworICAgICAgICAqIHJl cGxheS9SZXBsYXlDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvZ0Rpc3BhdGNo ZWRET01FdmVudCk6IEZpeCB0aGUgZm9ybWF0IHN0cmluZy4KKyAgICAgICAgKiByZXBsYXkvU2Vy aWFsaXphdGlvbk1ldGhvZHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZnJhbWVJbmRleEZyb21E b2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpmcmFtZUluZGV4RnJvbUZyYW1lKToKKyAgICAg ICAgKFdlYkNvcmU6OmRvY3VtZW50RnJvbUZyYW1lSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6 ZnJhbWVGcm9tRnJhbWVJbmRleCk6CisgICAgICAgIChKU0M6OkVuY29kaW5nVHJhaXRzPFBsdWdp bkRhdGE+OjplbmNvZGVWYWx1ZSk6CisgICAgICAgIChKU0M6OkVuY29kaW5nVHJhaXRzPFBsdWdp bkRhdGE+OjpkZWNvZGVWYWx1ZSk6CisgICAgICAgICogcmVwbGF5L1NlcmlhbGl6YXRpb25NZXRo b2RzLmg6CisgICAgICAgICogcmVwbGF5L1dlYklucHV0cy5qc29uOiBSZW1vdmUgcHJpbWl0aXZl IHR5cGVzIHdpdGhvdXQgZXhwbGljaXQgc2l6ZXMuCisKIDIwMTQtMDYtMDcgIFphbiBEb2JlcnNl ayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVzZSBDKysxMSBsYW1iZGFzIHRv IGNvbnN0cnVjdCBGaWxlVGhyZWFkOjpUYXNrIG9iamVjdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9yZXBsYXkvRW5jb2RlZFZhbHVlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9yZXBsYXkvRW5jb2RlZFZhbHVlLmNwcAppbmRleCAwMTkxZDQxNDhlZmJmNGRmZjk2NjNj Y2Q5OWU2YWM2MTUyNWMzY2MyLi5jZWU3MGUyNDNhNzIyYmQyNTJmODgzZWE4NTg3YzE5OWZjN2I4 MTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L0VuY29kZWRWYWx1 ZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3JlcGxheS9FbmNvZGVkVmFsdWUuY3Bw CkBAIC05MCwxMSArOTAsNiBAQCB0ZW1wbGF0ZTw+IEVuY29kZWRWYWx1ZSBTY2FsYXJFbmNvZGlu Z1RyYWl0czx1aW50NjRfdD46OmVuY29kZVZhbHVlKGNvbnN0IHVpbnQ2NAogICAgIHJldHVybiBF bmNvZGVkVmFsdWUoSW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKChkb3VibGUpdmFsdWUpKTsK IH0KIAotdGVtcGxhdGU8PiBFbmNvZGVkVmFsdWUgU2NhbGFyRW5jb2RpbmdUcmFpdHM8dW5zaWdu ZWQgbG9uZz46OmVuY29kZVZhbHVlKGNvbnN0IHVuc2lnbmVkIGxvbmcmIHZhbHVlKQotewotICAg IHJldHVybiBFbmNvZGVkVmFsdWUoSW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKChkb3VibGUp dmFsdWUpKTsKLX0KLQogdGVtcGxhdGU8PiBib29sIEVuY29kZWRWYWx1ZTo6Y29udmVydFRvPGJv b2w+KCkKIHsKICAgICBib29sIHJlc3VsdDsKQEAgLTE1OCwxNSArMTUzLDYgQEAgdGVtcGxhdGU8 PiB1aW50NjRfdCBFbmNvZGVkVmFsdWU6OmNvbnZlcnRUbzx1aW50NjRfdD4oKQogICAgIHJldHVy biByZXN1bHQ7CiB9CiAKLXRlbXBsYXRlPD4gdW5zaWduZWQgbG9uZyBFbmNvZGVkVmFsdWU6OmNv bnZlcnRUbzx1bnNpZ25lZCBsb25nPigpCi17Ci0gICAgdW5zaWduZWQgbG9uZyByZXN1bHQ7Ci0g ICAgYm9vbCBjYXN0U3VjY2VlZGVkID0gbV92YWx1ZS0+YXNOdW1iZXIoJnJlc3VsdCk7Ci0gICAg QVNTRVJUX1VOVVNFRChjYXN0U3VjY2VlZGVkLCBjYXN0U3VjY2VlZGVkKTsKLQotICAgIHJldHVy biByZXN1bHQ7Ci19Ci0KIHRlbXBsYXRlPD4gU3RyaW5nIEVuY29kZWRWYWx1ZTo6Y29udmVydFRv PFN0cmluZz4oKQogewogICAgIFN0cmluZyByZXN1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcmVwbGF5L0VuY29kZWRWYWx1ZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3JlcGxheS9FbmNvZGVkVmFsdWUuaAppbmRleCBmMTQ3N2FhNTM1YWVmYjMwOTJiYzA1ZmIzNTQy ODZjMWZhZmZmYmU1Li5kNDZlOTgzMGNlYWRlZDI0YzViY2ZmYjVkMjg2OTFhNzE4MGFhODFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcmVwbGF5L0VuY29kZWRWYWx1ZS5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9yZXBsYXkvRW5jb2RlZFZhbHVlLmgKQEAgLTkyLDcg KzkyLDYgQEAgdGVtcGxhdGU8PiBKU19FWFBPUlRfUFJJVkFURSBpbnQzMl90IEVuY29kZWRWYWx1 ZTo6Y29udmVydFRvPGludDMyX3Q+KCk7CiB0ZW1wbGF0ZTw+IEpTX0VYUE9SVF9QUklWQVRFIGlu dDY0X3QgRW5jb2RlZFZhbHVlOjpjb252ZXJ0VG88aW50NjRfdD4oKTsKIHRlbXBsYXRlPD4gSlNf RVhQT1JUX1BSSVZBVEUgdWludDMyX3QgRW5jb2RlZFZhbHVlOjpjb252ZXJ0VG88dWludDMyX3Q+ KCk7CiB0ZW1wbGF0ZTw+IEpTX0VYUE9SVF9QUklWQVRFIHVpbnQ2NF90IEVuY29kZWRWYWx1ZTo6 Y29udmVydFRvPHVpbnQ2NF90PigpOwotdGVtcGxhdGU8PiBKU19FWFBPUlRfUFJJVkFURSB1bnNp Z25lZCBsb25nIEVuY29kZWRWYWx1ZTo6Y29udmVydFRvPHVuc2lnbmVkIGxvbmc+KCk7CiB0ZW1w bGF0ZTw+IEpTX0VYUE9SVF9QUklWQVRFIFN0cmluZyBFbmNvZGVkVmFsdWU6OmNvbnZlcnRUbzxT dHJpbmc+KCk7CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CkBAIC0xNTYsNyArMTU1LDYgQEAgdGVt cGxhdGU8PiBzdHJ1Y3QgRW5jb2RpbmdUcmFpdHM8aW50MzJfdD4gOiBwdWJsaWMgU2NhbGFyRW5j b2RpbmdUcmFpdHM8aW50MzJfdD4KIHRlbXBsYXRlPD4gc3RydWN0IEVuY29kaW5nVHJhaXRzPGlu dDY0X3Q+IDogcHVibGljIFNjYWxhckVuY29kaW5nVHJhaXRzPGludDY0X3Q+IHsgfTsKIHRlbXBs YXRlPD4gc3RydWN0IEVuY29kaW5nVHJhaXRzPHVpbnQzMl90PiA6IHB1YmxpYyBTY2FsYXJFbmNv ZGluZ1RyYWl0czx1aW50MzJfdD4geyB9OwogdGVtcGxhdGU8PiBzdHJ1Y3QgRW5jb2RpbmdUcmFp dHM8dWludDY0X3Q+IDogcHVibGljIFNjYWxhckVuY29kaW5nVHJhaXRzPHVpbnQ2NF90PiB7IH07 Ci10ZW1wbGF0ZTw+IHN0cnVjdCBFbmNvZGluZ1RyYWl0czx1bnNpZ25lZCBsb25nPiA6IHB1Ymxp YyBTY2FsYXJFbmNvZGluZ1RyYWl0czx1bnNpZ25lZCBsb25nPiB7IH07CiAKIHRlbXBsYXRlPD4g c3RydWN0IEVuY29kaW5nVHJhaXRzPFN0cmluZz4gOiBwdWJsaWMgU2NhbGFyRW5jb2RpbmdUcmFp dHM8U3RyaW5nPiB7CiAgICAgc3RhdGljIEVuY29kZWRWYWx1ZSBlbmNvZGVWYWx1ZShjb25zdCBT dHJpbmcmIHZhbHVlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVwbGF5L1JlcGxheUNv bnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVwbGF5L1JlcGxheUNvbnRyb2xsZXIuY3Bw CmluZGV4IDY3YjQyNDdkY2M3YWY0NzQ3MGViM2EwZTI2ZWRkM2Q5ZWM0ODhkNDcuLjExZmQxMTM4 MzlmNmY1NjQzZWI0MzhhOGE2NzQ1NGZiMGI3MThhMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlcGxheS9SZXBsYXlDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZXBs YXkvUmVwbGF5Q29udHJvbGxlci5jcHAKQEAgLTY3LDE0ICs2NywxNCBAQCBzdGF0aWMgdm9pZCBs b2dEaXNwYXRjaGVkRE9NRXZlbnQoY29uc3QgRXZlbnQmIGV2ZW50LCBib29sIGV2ZW50SXNVbnJl bGF0ZWQpCiAKICAgICAvLyBBIERPTSBldmVudCBpcyB1bnJlbGF0ZWQgaWYgaXQgaXMgYmVpbmcg ZGlzcGF0Y2hlZCB0byBhIGRvY3VtZW50IHRoYXQgaXMgbmVpdGhlciBjYXB0dXJpbmcgbm9yIHJl cGxheWluZy4KICAgICBpZiAoTm9kZSogbm9kZSA9IHRhcmdldC0+dG9Ob2RlKCkpIHsKLSAgICAg ICAgTE9HKFdlYlJlcGxheSwgIiUtMjBzIC0tLT4lcyBET00gZXZlbnQ6IHR5cGU9JXMsIHRhcmdl dD0lbHUvbm9kZVslcF0gJXNcbiIsICJSZXBsYXlFdmVudHMiLAorICAgICAgICBMT0coV2ViUmVw bGF5LCAiJS0yMHMgLS0tPiVzIERPTSBldmVudDogdHlwZT0lcywgdGFyZ2V0PSV1L25vZGVbJXBd ICVzXG4iLCAiUmVwbGF5RXZlbnRzIiwKICAgICAgICAgICAgIChldmVudElzVW5yZWxhdGVkKSA/ ICJVbnJlbGF0ZWQiIDogIkRpc3BhdGNoaW5nIiwKICAgICAgICAgICAgIGV2ZW50LnR5cGUoKS5z dHJpbmcoKS51dGY4KCkuZGF0YSgpLAogICAgICAgICAgICAgZnJhbWVJbmRleEZyb21Eb2N1bWVu dCgobm9kZS0+aW5Eb2N1bWVudCgpKSA/ICZub2RlLT5kb2N1bWVudCgpIDogbm9kZS0+b3duZXJE b2N1bWVudCgpKSwKICAgICAgICAgICAgIG5vZGUsCiAgICAgICAgICAgICBub2RlLT5ub2RlTmFt ZSgpLnV0ZjgoKS5kYXRhKCkpOwogICAgIH0gZWxzZSBpZiAoRE9NV2luZG93KiB3aW5kb3cgPSB0 YXJnZXQtPnRvRE9NV2luZG93KCkpIHsKLSAgICAgICAgTE9HKFdlYlJlcGxheSwgIiUtMjBzIC0t LT4lcyBET00gZXZlbnQ6IHR5cGU9JXMsIHRhcmdldD0lbHUvd2luZG93WyVwXSAlc1xuIiwgIlJl cGxheUV2ZW50cyIsCisgICAgICAgIExPRyhXZWJSZXBsYXksICIlLTIwcyAtLS0+JXMgRE9NIGV2 ZW50OiB0eXBlPSVzLCB0YXJnZXQ9JXUvd2luZG93WyVwXSAlc1xuIiwgIlJlcGxheUV2ZW50cyIs CiAgICAgICAgICAgICAoZXZlbnRJc1VucmVsYXRlZCkgPyAiVW5yZWxhdGVkIiA6ICJEaXNwYXRj aGluZyIsCiAgICAgICAgICAgICBldmVudC50eXBlKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwK ICAgICAgICAgICAgIGZyYW1lSW5kZXhGcm9tRG9jdW1lbnQod2luZG93LT5kb2N1bWVudCgpKSwK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlcGxheS9TZXJpYWxpemF0aW9uTWV0aG9kcy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZXBsYXkvU2VyaWFsaXphdGlvbk1ldGhvZHMuY3BwCmluZGV4 IGJlNDVmMWI0MDQ5NmFkNDYzYzFjOGEzNWRkNDBmNmM3ZjZiYTRiMzAuLjQ0ZTc4ZThmNDBiNjFh ZTlkZGYzY2IyOGQ2YTM0MTY3YzgwYjJlYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl cGxheS9TZXJpYWxpemF0aW9uTWV0aG9kcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVwbGF5 L1NlcmlhbGl6YXRpb25NZXRob2RzLmNwcApAQCAtNzIsMTggKzcyLDE4IEBAIFdFQl9SRVBMQVlf SU5QVVRfTkFNRVNfRk9SX0VBQ0goSU1QT1JUX0ZST01fV0VCQ09SRV9OQU1FU1BBQ0UpCiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotdW5zaWduZWQgbG9uZyBmcmFtZUluZGV4RnJvbURvY3VtZW50 KGNvbnN0IERvY3VtZW50KiBkb2N1bWVudCkKK3VpbnQzMl90IGZyYW1lSW5kZXhGcm9tRG9jdW1l bnQoY29uc3QgRG9jdW1lbnQqIGRvY3VtZW50KQogewogICAgIEFTU0VSVChkb2N1bWVudCk7CiAg ICAgQVNTRVJUKGRvY3VtZW50LT5mcmFtZSgpKTsKICAgICByZXR1cm4gZnJhbWVJbmRleEZyb21G cmFtZShkb2N1bWVudC0+ZnJhbWUoKSk7CiB9CiAKLXVuc2lnbmVkIGxvbmcgZnJhbWVJbmRleEZy b21GcmFtZShjb25zdCBGcmFtZSogdGFyZ2V0RnJhbWUpCit1aW50MzJfdCBmcmFtZUluZGV4RnJv bUZyYW1lKGNvbnN0IEZyYW1lKiB0YXJnZXRGcmFtZSkKIHsKICAgICBBU1NFUlQodGFyZ2V0RnJh bWUpOwogCi0gICAgdW5zaWduZWQgbG9uZyBjdXJyZW50SW5kZXggPSAwOworICAgIHVpbnQzMl90 IGN1cnJlbnRJbmRleCA9IDA7CiAgICAgY29uc3QgRnJhbWUqIG1haW5GcmFtZSA9ICZ0YXJnZXRG cmFtZS0+dHJlZSgpLnRvcCgpOwogICAgIGZvciAoY29uc3QgRnJhbWUqIGZyYW1lID0gbWFpbkZy YW1lOyBmcmFtZTsgKytjdXJyZW50SW5kZXgsIGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJz ZU5leHQobWFpbkZyYW1lKSkgewogICAgICAgICBpZiAoZnJhbWUgPT0gdGFyZ2V0RnJhbWUpCkBA IC05NCwyMCArOTQsMjAgQEAgdW5zaWduZWQgbG9uZyBmcmFtZUluZGV4RnJvbUZyYW1lKGNvbnN0 IEZyYW1lKiB0YXJnZXRGcmFtZSkKICAgICByZXR1cm4gMDsKIH0KIAotRG9jdW1lbnQqIGRvY3Vt ZW50RnJvbUZyYW1lSW5kZXgoUGFnZSogcGFnZSwgdW5zaWduZWQgbG9uZyBmcmFtZUluZGV4KQor RG9jdW1lbnQqIGRvY3VtZW50RnJvbUZyYW1lSW5kZXgoUGFnZSogcGFnZSwgdWludDMyX3QgZnJh bWVJbmRleCkKIHsKICAgICBGcmFtZSogZnJhbWUgPSBmcmFtZUZyb21GcmFtZUluZGV4KHBhZ2Us IGZyYW1lSW5kZXgpOwogICAgIHJldHVybiBmcmFtZSA/IGZyYW1lLT5kb2N1bWVudCgpIDogbnVs bHB0cjsKIH0KIAotRnJhbWUqIGZyYW1lRnJvbUZyYW1lSW5kZXgoUGFnZSogcGFnZSwgdW5zaWdu ZWQgbG9uZyBmcmFtZUluZGV4KQorRnJhbWUqIGZyYW1lRnJvbUZyYW1lSW5kZXgoUGFnZSogcGFn ZSwgdWludDMyX3QgZnJhbWVJbmRleCkKIHsKICAgICBBU1NFUlQocGFnZSk7CiAgICAgQVNTRVJU KGZyYW1lSW5kZXggPj0gMCk7CiAKICAgICBNYWluRnJhbWUqIG1haW5GcmFtZSA9ICZwYWdlLT5t YWluRnJhbWUoKTsKICAgICBGcmFtZSogZnJhbWUgPSBtYWluRnJhbWU7Ci0gICAgdW5zaWduZWQg bG9uZyBjdXJyZW50SW5kZXggPSAwOworICAgIHVpbnQzMl90IGN1cnJlbnRJbmRleCA9IDA7CiAg ICAgZm9yICg7IGN1cnJlbnRJbmRleCA8IGZyYW1lSW5kZXggJiYgZnJhbWU7ICsrY3VycmVudElu ZGV4LCBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KG1haW5GcmFtZSkpIHsgfQog CiAgICAgcmV0dXJuIGZyYW1lOwpAQCAtMjk0LDcgKzI5NCw3IEBAIGJvb2wgRW5jb2RpbmdUcmFp dHM8UGxhdGZvcm1LZXlib2FyZEV2ZW50Pjo6ZGVjb2RlVmFsdWUoRW5jb2RlZFZhbHVlJiBlbmNv ZGVkVmFsCiAgICAgREVDT0RFX1RZUEVfV0lUSF9LRVkoZW5jb2RlZFZhbHVlLCBWZWN0b3I8S2V5 cHJlc3NDb21tYW5kPiwgY29tbWFuZHMpOwogI2VuZGlmCiAKLSAgICBQbGF0Zm9ybUtleWJvYXJk RXZlbnQgcGxhdGZvcm1FdmVudCA9IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCh0eXBlLCB0ZXh0LCB1 bm1vZGlmaWVkVGV4dCwga2V5SWRlbnRpZmllciwgd2luZG93c1ZpcnR1YWxLZXlDb2RlLCBuYXRp dmVWaXJ0dWFsS2V5Q29kZSwgbWFjQ2hhckNvZGUsIGF1dG9SZXBlYXQsIGtleXBhZCwgc3lzdGVt S2V5LCBtb2RpZmllcnMsIHRpbWVzdGFtcCk7CisgICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50IHBs YXRmb3JtRXZlbnQgPSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQodHlwZSwgdGV4dCwgdW5tb2RpZmll ZFRleHQsIGtleUlkZW50aWZpZXIsIFdURjo6c2FmZUNhc3Q8aW50Pih3aW5kb3dzVmlydHVhbEtl eUNvZGUpLCBXVEY6OnNhZmVDYXN0PGludD4obmF0aXZlVmlydHVhbEtleUNvZGUpLCBXVEY6OnNh ZmVDYXN0PGludD4obWFjQ2hhckNvZGUpLCBhdXRvUmVwZWF0LCBrZXlwYWQsIHN5c3RlbUtleSwg bW9kaWZpZXJzLCB0aW1lc3RhbXApOwogI2lmIFVTRShBUFBLSVQpCiAgICAgaW5wdXQgPSBzdGQ6 Om1ha2VfdW5pcXVlPFBsYXRmb3JtS2V5Ym9hcmRFdmVudEFwcEtpdD4ocGxhdGZvcm1FdmVudCwg aGFuZGxlZEJ5SW5wdXRNZXRob2QsIGNvbW1hbmRzKTsKICNlbHNlCkBAIC00NDUsOSArNDQ1LDEz IEBAIEVuY29kZWRWYWx1ZSBFbmNvZGluZ1RyYWl0czxQbHVnaW5EYXRhPjo6ZW5jb2RlVmFsdWUo UmVmUHRyPFBsdWdpbkRhdGE+IGlucHV0KQogewogICAgIEVuY29kZWRWYWx1ZSBlbmNvZGVkRGF0 YSA9IEVuY29kZWRWYWx1ZTo6Y3JlYXRlT2JqZWN0KCk7CiAKKyAgICBWZWN0b3I8dWludDMyX3Q+ IGNhc3RlZE1pbWVQbHVnaW5JbmRpY2VzKGlucHV0LT5taW1lUGx1Z2luSW5kaWNlcygpLnNpemUo KSk7CisgICAgZm9yICh1aW50MzJfdCBpbmRleCA6IGlucHV0LT5taW1lUGx1Z2luSW5kaWNlcygp KQorICAgICAgICBjYXN0ZWRNaW1lUGx1Z2luSW5kaWNlcy5hcHBlbmQoV1RGOjpzYWZlQ2FzdDx1 aW50MzJfdD4oaW5kZXgpKTsKKwogICAgIEVOQ09ERV9UWVBFX1dJVEhfS0VZKGVuY29kZWREYXRh LCBWZWN0b3I8UGx1Z2luSW5mbz4sIHBsdWdpbnMsIGlucHV0LT5wbHVnaW5zKCkpOwogICAgIEVO Q09ERV9UWVBFX1dJVEhfS0VZKGVuY29kZWREYXRhLCBWZWN0b3I8TWltZUNsYXNzSW5mbz4sIG1p bWVzLCBpbnB1dC0+bWltZXMoKSk7Ci0gICAgRU5DT0RFX1RZUEVfV0lUSF9LRVkoZW5jb2RlZERh dGEsIFZlY3RvcjxzaXplX3Q+LCBtaW1lUGx1Z2luSW5kaWNlcywgaW5wdXQtPm1pbWVQbHVnaW5J bmRpY2VzKCkpOworICAgIEVOQ09ERV9UWVBFX1dJVEhfS0VZKGVuY29kZWREYXRhLCBWZWN0b3I8 dWludDMyX3Q+LCBtaW1lUGx1Z2luSW5kaWNlcywgY2FzdGVkTWltZVBsdWdpbkluZGljZXMpOwog CiAgICAgcmV0dXJuIGVuY29kZWREYXRhOwogfQpAQCAtNDY0LDkgKzQ2OCwxMyBAQCBib29sIEVu Y29kaW5nVHJhaXRzPFBsdWdpbkRhdGE+OjpkZWNvZGVWYWx1ZShFbmNvZGVkVmFsdWUmIGVuY29k ZWREYXRhLCBSZWZQdHI8UAogewogICAgIERFQ09ERV9UWVBFX1dJVEhfS0VZKGVuY29kZWREYXRh LCBWZWN0b3I8UGx1Z2luSW5mbz4sIHBsdWdpbnMpOwogICAgIERFQ09ERV9UWVBFX1dJVEhfS0VZ KGVuY29kZWREYXRhLCBWZWN0b3I8TWltZUNsYXNzSW5mbz4sIG1pbWVzKTsKLSAgICBERUNPREVf VFlQRV9XSVRIX0tFWShlbmNvZGVkRGF0YSwgVmVjdG9yPHNpemVfdD4sIG1pbWVQbHVnaW5JbmRp Y2VzKTsKKyAgICBERUNPREVfVFlQRV9XSVRIX0tFWShlbmNvZGVkRGF0YSwgVmVjdG9yPHVpbnQz Ml90PiwgbWltZVBsdWdpbkluZGljZXMpOworCisgICAgVmVjdG9yPHNpemVfdD4gY2FzdGVkTWlt ZVBsdWdpbkluZGljZXMobWltZVBsdWdpbkluZGljZXMuc2l6ZSgpKTsKKyAgICBmb3IgKHVpbnQz Ml90IGluZGV4IDogbWltZVBsdWdpbkluZGljZXMpCisgICAgICAgIGNhc3RlZE1pbWVQbHVnaW5J bmRpY2VzLmFwcGVuZChXVEY6OnNhZmVDYXN0PHNpemVfdD4oaW5kZXgpKTsKIAotICAgIGlucHV0 ID0gYWRvcHRSZWYobmV3IERlc2VyaWFsaXplZFBsdWdpbkRhdGEocGx1Z2lucywgbWltZXMsIG1p bWVQbHVnaW5JbmRpY2VzKSk7CisgICAgaW5wdXQgPSBhZG9wdFJlZihuZXcgRGVzZXJpYWxpemVk UGx1Z2luRGF0YShwbHVnaW5zLCBtaW1lcywgY2FzdGVkTWltZVBsdWdpbkluZGljZXMpKTsKIAog ICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVwbGF5L1Nl cmlhbGl6YXRpb25NZXRob2RzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZXBsYXkvU2VyaWFsaXphdGlv bk1ldGhvZHMuaAppbmRleCAwMjQyMDhiYjcwNTgyMzMwNTUxMGM2YjY4Njk2NzE1MDNiMTVmZjU0 Li5lN2VjMzE1ZTJkNTRhZmJiMWJkNGVmYzkwNmQwZDE3NWY1MzY0NzI5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZXBsYXkvU2VyaWFsaXphdGlvbk1ldGhvZHMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZXBsYXkvU2VyaWFsaXphdGlvbk1ldGhvZHMuaApAQCAtNTAsMTAgKzUwLDEwIEBA IGNsYXNzIFVSTDsKIHN0cnVjdCBLZXlwcmVzc0NvbW1hbmQ7CiAjZW5kaWYKIAotdW5zaWduZWQg bG9uZyBmcmFtZUluZGV4RnJvbURvY3VtZW50KGNvbnN0IERvY3VtZW50Kik7Ci11bnNpZ25lZCBs b25nIGZyYW1lSW5kZXhGcm9tRnJhbWUoY29uc3QgRnJhbWUqKTsKLURvY3VtZW50KiBkb2N1bWVu dEZyb21GcmFtZUluZGV4KFBhZ2UqLCB1bnNpZ25lZCBsb25nIGZyYW1lSW5kZXgpOwotRnJhbWUq IGZyYW1lRnJvbUZyYW1lSW5kZXgoUGFnZSosIHVuc2lnbmVkIGxvbmcgZnJhbWVJbmRleCk7Cit1 aW50MzJfdCBmcmFtZUluZGV4RnJvbURvY3VtZW50KGNvbnN0IERvY3VtZW50Kik7Cit1aW50MzJf dCBmcmFtZUluZGV4RnJvbUZyYW1lKGNvbnN0IEZyYW1lKik7CitEb2N1bWVudCogZG9jdW1lbnRG cm9tRnJhbWVJbmRleChQYWdlKiwgdWludDMyX3QgZnJhbWVJbmRleCk7CitGcmFtZSogZnJhbWVG cm9tRnJhbWVJbmRleChQYWdlKiwgdWludDMyX3QgZnJhbWVJbmRleCk7CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVwbGF5L1dlYklucHV0 cy5qc29uIGIvU291cmNlL1dlYkNvcmUvcmVwbGF5L1dlYklucHV0cy5qc29uCmluZGV4IGRhNWJl M2VkM2RmMTRiYTcyMjBjMjUzZDU5MjUyOTg4YjY3NWMzMTEuLjlkOGFmNmVlMjllOTM3YTFhOWNj Y2E5NTQxZDc1ZjhhMDQzNWU4NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlcGxheS9X ZWJJbnB1dHMuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZXBsYXkvV2ViSW5wdXRzLmpzb24K QEAgLTMsMTAgKzMsMTAgQEAKICAgICAgICAgIkdsb2JhbCI6IFsKICAgICAgICAgICAgIHsgIm5h bWUiOiAiYm9vbCIsICJtb2RlIjogIlNDQUxBUiIgfSwKICAgICAgICAgICAgIHsgIm5hbWUiOiAi ZG91YmxlIiwgIm1vZGUiOiAiU0NBTEFSIiB9LAotICAgICAgICAgICAgeyAibmFtZSI6ICJpbnQi LCAibW9kZSI6ICJTQ0FMQVIiIH0sCi0gICAgICAgICAgICB7ICJuYW1lIjogInVuc2lnbmVkIiwg Im1vZGUiOiAiU0NBTEFSIiB9LAotICAgICAgICAgICAgeyAibmFtZSI6ICJ1bnNpZ25lZCBsb25n IiwgIm1vZGUiOiAiU0NBTEFSIiB9LAotICAgICAgICAgICAgeyAibmFtZSI6ICJ1bnNpZ25lZCBs b25nIGxvbmciLCAibW9kZSI6ICJTQ0FMQVIiIH0KKyAgICAgICAgICAgIHsgIm5hbWUiOiAidWlu dDMyX3QiLCAibW9kZSI6ICJTQ0FMQVIiLCAiZGVzY3JpcHRpb24iOiAiVW5zaWduZWQgMzItYml0 IGludGVnZXIuIiB9LAorICAgICAgICAgICAgeyAibmFtZSI6ICJ1aW50NjRfdCIsICJtb2RlIjog IlNDQUxBUiIsICJkZXNjcmlwdGlvbiI6ICJVbnNpZ25lZCA2NC1iaXQgaW50ZWdlci4iIH0sCisg ICAgICAgICAgICB7ICJuYW1lIjogImludDMyX3QiLCAibW9kZSI6ICJTQ0FMQVIiLCAiZGVzY3Jp cHRpb24iOiAiU2lnbmVkIDMyLWJpdCBpbnRlZ2VyLiIgfSwKKyAgICAgICAgICAgIHsgIm5hbWUi OiAiaW50NjRfdCIsICJtb2RlIjogIlNDQUxBUiIsICJkZXNjcmlwdGlvbiI6ICJTaWduZWQgNjQt Yml0IGludGVnZXIuIiB9CiAgICAgICAgIF0sCiAKICAgICAgICAgIldURiI6IFsK