100547 2012-10-26 11:31:34 -0700 [WebKitIDL] Optional dictionary types should have default values of empty dictionary 2012-10-26 14:55:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jsbell jsbell abarth alecflett eric.carlson feature-media-reviews haraken hta japhet ojan tommyw webkit.review.bot oldest_to_newest 752213 0 jsbell 2012-10-26 11:31:34 -0700 [WebKitIDL] Optional dictionary types should have default values of empty dictionary 752221 1 170971 jsbell 2012-10-26 11:37:55 -0700 Created attachment 170971 Patch 752380 2 170971 abarth 2012-10-26 14:12:59 -0700 Comment on attachment 170971 Patch Great! 752447 3 170971 webkit.review.bot 2012-10-26 14:55:34 -0700 Comment on attachment 170971 Patch Clearing flags on attachment: 170971 Committed r132698: <http://trac.webkit.org/changeset/132698> 752448 4 webkit.review.bot 2012-10-26 14:55:39 -0700 All reviewed patches have been landed. Closing bug. 170971 2012-10-26 11:37:55 -0700 2012-10-26 14:55:34 -0700 Patch bug-100547-20121026113627.patch text/plain 14714 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjI1ZGMyN2YzYjg5ODIz ODI5ODRkNDJjYmYwZTA2YjRiMTI3YWFhMi4uZGJkMDM1NjJlYWIwZjkzNGUxMjE5NWJhZjAwMzIz YWI2ZjVjMGYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTEwLTI2ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1dlYktpdElETF0gT3B0 aW9uYWwgZGljdGlvbmFyeSB0eXBlcyBzaG91bGQgaGF2ZSBkZWZhdWx0IHZhbHVlcyBvZiBlbXB0 eSBkaWN0aW9uYXJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDA1NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBQZXIgV2ViSURMLCAiT3B0aW9uYWwgZGljdGlvbmFyeSB0eXBlIGFyZ3VtZW50cyBhcmUg YWx3YXlzIGNvbnNpZGVyZWQgdG8gaGF2ZSBhIGRlZmF1bHQKKyAgICAgICAgdmFsdWUgb2YgYW4g ZW1wdHkgZGljdGlvbmFyeS4iIFdlYktpdElETCBhbHJlYWR5IHN1cHBvcnRlZCB0aGlzIHZpYSB0 aGUgZXh0ZW5kZWQgYXR0cmlidXRlCisgICAgICAgIFtPcHRpb25hbD1EZWZhdWx0SXNVbmRlZmlu ZWRdIGJ1dCBtYWtlIHRoaXMgdGhlIGRlZmF1bHQgZm9yIERpY3Rpb25hcnkuCisKKyAgICAgICAg QmluZGluZyB0ZXN0IGV4cGVjdGF0aW9ucyB1cGRhdGVkLgorCisgICAgICAgICogTW9kdWxlcy9m aWxlc3lzdGVtL0RpcmVjdG9yeUVudHJ5Lmg6IFJlbW92ZSBkZWZhdWx0IHBhcmFtZXRlcnMuCisg ICAgICAgIChEaXJlY3RvcnlFbnRyeSk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURC RGF0YWJhc2UuaDogUmVtb3ZlIG92ZXJsb2Fkcy4KKyAgICAgICAgKElEQkRhdGFiYXNlKToKKyAg ICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5oOiBSZW1vdmUgb3Zlcmxv YWRzLgorICAgICAgICAoSURCT2JqZWN0U3RvcmUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaWRsOiBSZW1vdmUgRGVmYXVsdElzVW5kZWZpbmVkIGFu bm90YXRpb25zLgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt OiBTcGVjaWFsIGNhc2UgZm9yIE9wdGlvbmFsIERpY3Rpb25hcnkuCisgICAgICAgIChHZW5lcmF0 ZVBhcmFtZXRlcnNDaGVjayk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yVjgucG06IERpdHRvLgorICAgICAgICAoR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAg ICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwOgorICAgICAgICAo V2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25PcHRpb25zT2JqZWN0KTogVXBkYXRl ZCBleHBlY3RhdGlvbiAtIG5vIGVhcmx5IGNhbGwuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRl cm5hbDo6b3B0aW9uc09iamVjdENhbGxiYWNrKTogRGl0dG8uCisKIDIwMTItMTAtMjYgIEtlbm5l dGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFBy aW50aW5nIHNob3VsZCB1c2UgdXNlIGhpZ2ggcmVzb2x1dGlvbiBpbWFnZXMgd2hlbiBhdmFpbGFi bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbS9EaXJlY3Rv cnlFbnRyeS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9maWxlc3lzdGVtL0RpcmVjdG9yeUVu dHJ5LmgKaW5kZXggNThjOWU3ZjY3MWZhZDQ5NzA2YmUxMzYxNWU2MTYyMWM0ZWRhZTUwZC4uNTA1 NWM2MzFiZjkyNDJkYzQ2NTk3YTc3ZmVmNzIwM2IyZmFiM2I4MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9maWxlc3lzdGVtL0RpcmVjdG9yeUVudHJ5LmgKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9maWxlc3lzdGVtL0RpcmVjdG9yeUVudHJ5LmgKQEAgLTU2LDggKzU2 LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc0RpcmVjdG9yeSgpIGNvbnN0IHsgcmV0 dXJuIHRydWU7IH0KIAogICAgIFBhc3NSZWZQdHI8RGlyZWN0b3J5UmVhZGVyPiBjcmVhdGVSZWFk ZXIoKTsKLSAgICB2b2lkIGdldEZpbGUoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBEaWN0aW9u YXJ5JiA9IERpY3Rpb25hcnkoKSwgUGFzc1JlZlB0cjxFbnRyeUNhbGxiYWNrPiA9IDAsIFBhc3NS ZWZQdHI8RXJyb3JDYWxsYmFjaz4gPSAwKTsKLSAgICB2b2lkIGdldERpcmVjdG9yeShjb25zdCBT dHJpbmcmIHBhdGgsIGNvbnN0IERpY3Rpb25hcnkmID0gRGljdGlvbmFyeSgpLCBQYXNzUmVmUHRy PEVudHJ5Q2FsbGJhY2s+ID0gMCwgUGFzc1JlZlB0cjxFcnJvckNhbGxiYWNrPiA9IDApOworICAg IHZvaWQgZ2V0RmlsZShjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IERpY3Rpb25hcnkmLCBQYXNz UmVmUHRyPEVudHJ5Q2FsbGJhY2s+ID0gMCwgUGFzc1JlZlB0cjxFcnJvckNhbGxiYWNrPiA9IDAp OworICAgIHZvaWQgZ2V0RGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgRGljdGlv bmFyeSYsIFBhc3NSZWZQdHI8RW50cnlDYWxsYmFjaz4gPSAwLCBQYXNzUmVmUHRyPEVycm9yQ2Fs bGJhY2s+ID0gMCk7CiAgICAgdm9pZCByZW1vdmVSZWN1cnNpdmVseShQYXNzUmVmUHRyPFZvaWRD YWxsYmFjaz4gc3VjY2Vzc0NhbGxiYWNrID0gMCwgUGFzc1JlZlB0cjxFcnJvckNhbGxiYWNrPiA9 IDApIGNvbnN0OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCRGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkRhdGFiYXNlLmgKaW5kZXggYjhiYTE5NDUwMGIyOTc0Y2U4NzA0YjY0ZGI0ZmRmOTcy MmJjOTM5MS4uNTgxNjE2NzNjNWIwMzQ5NmY2MDQwNzQ3ZjJlMmE1YTRlOGVjOWRhZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZS5oCkBAIC02Miw4 ICs2Miw2IEBAIHB1YmxpYzoKICAgICBQYXNzUmVmUHRyPElEQkFueT4gdmVyc2lvbigpIGNvbnN0 OwogICAgIFBhc3NSZWZQdHI8RE9NU3RyaW5nTGlzdD4gb2JqZWN0U3RvcmVOYW1lcygpIGNvbnN0 OwogCi0gICAgLy8gRklYTUU6IFRyeSB0byBtb2RpZnkgdGhlIGNvZGUgZ2VuZXJhdG9yIHNvIHRo aXMgaXMgdW5uZWVkZWQuCi0gICAgUGFzc1JlZlB0cjxJREJPYmplY3RTdG9yZT4gY3JlYXRlT2Jq ZWN0U3RvcmUoY29uc3QgU3RyaW5nJiBuYW1lLCBFeGNlcHRpb25Db2RlJiBlYykgeyByZXR1cm4g Y3JlYXRlT2JqZWN0U3RvcmUobmFtZSwgRGljdGlvbmFyeSgpLCBlYyk7IH0KICAgICBQYXNzUmVm UHRyPElEQk9iamVjdFN0b3JlPiBjcmVhdGVPYmplY3RTdG9yZShjb25zdCBTdHJpbmcmIG5hbWUs IGNvbnN0IERpY3Rpb25hcnkmLCBFeGNlcHRpb25Db2RlJik7CiAgICAgUGFzc1JlZlB0cjxJREJU cmFuc2FjdGlvbj4gdHJhbnNhY3Rpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQ dHI8RE9NU3RyaW5nTGlzdD4sIGNvbnN0IFN0cmluZyYgbW9kZSwgRXhjZXB0aW9uQ29kZSYpOwog ICAgIFBhc3NSZWZQdHI8SURCVHJhbnNhY3Rpb24+IHRyYW5zYWN0aW9uKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmIG1vZGUsIEV4Y2VwdGlvbkNv ZGUmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9i amVjdFN0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RT dG9yZS5oCmluZGV4IDJhOGNmY2Y5N2Y2MDAwNDdkMzNkYjU0ZjIzMWE4MjJhZGNhNzYzZmEuLjlm MDI3ZWEwYzY0NjI4ZjZkZGUwNzAxMjJkYTFhOGZhZTZmZWIyNmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT2JqZWN0U3RvcmUuaApAQCAtODEsMTEgKzgx LDggQEAgcHVibGljOgogICAgIFBhc3NSZWZQdHI8SURCUmVxdWVzdD4gZGVsZXRlRnVuY3Rpb24o U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8SURCS2V5PiBrZXksIEV4Y2VwdGlv bkNvZGUmKTsKICAgICBQYXNzUmVmUHRyPElEQlJlcXVlc3Q+IGNsZWFyKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqLCBFeGNlcHRpb25Db2RlJik7CiAKLSAgICAvLyBGSVhNRTogVHJ5IHRvIG1vZGlm eSB0aGUgY29kZSBnZW5lcmF0b3Igc28gdGhpcyBkdXBsaWNhdGlvbiBpcyB1bm5lZWRlZC4KICAg ICBQYXNzUmVmUHRyPElEQkluZGV4PiBjcmVhdGVJbmRleChTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGtleVBhdGgsIGNvbnN0IERpY3Rp b25hcnkmLCBFeGNlcHRpb25Db2RlJik7Ci0gICAgUGFzc1JlZlB0cjxJREJJbmRleD4gY3JlYXRl SW5kZXgoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgY29uc3QgU3RyaW5nJiBuYW1l LCBjb25zdCBTdHJpbmcmIGtleVBhdGgsIEV4Y2VwdGlvbkNvZGUmIGVjKSB7IHJldHVybiBjcmVh dGVJbmRleChjb250ZXh0LCBuYW1lLCBrZXlQYXRoLCBEaWN0aW9uYXJ5KCksIGVjKTsgfQogICAg IFBhc3NSZWZQdHI8SURCSW5kZXg+IGNyZWF0ZUluZGV4KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQq LCBjb25zdCBTdHJpbmcmIG5hbWUsIFBhc3NSZWZQdHI8RE9NU3RyaW5nTGlzdD4ga2V5UGF0aCwg Y29uc3QgRGljdGlvbmFyeSYsIEV4Y2VwdGlvbkNvZGUmKTsKLSAgICBQYXNzUmVmUHRyPElEQklu ZGV4PiBjcmVhdGVJbmRleChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBjb25zdCBT dHJpbmcmIG5hbWUsIFBhc3NSZWZQdHI8RE9NU3RyaW5nTGlzdD4ga2V5UGF0aCwgRXhjZXB0aW9u Q29kZSYgZWMpIHsgcmV0dXJuIGNyZWF0ZUluZGV4KGNvbnRleHQsIG5hbWUsIGtleVBhdGgsIERp Y3Rpb25hcnkoKSwgZWMpOyB9CiAgICAgUGFzc1JlZlB0cjxJREJJbmRleD4gY3JlYXRlSW5kZXgo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IFN0cmluZyYsIGNvbnN0IElEQktleVBhdGgm LCBjb25zdCBEaWN0aW9uYXJ5JiwgRXhjZXB0aW9uQ29kZSYpOwogCiAgICAgUGFzc1JlZlB0cjxJ REJJbmRleD4gaW5kZXgoY29uc3QgU3RyaW5nJiBuYW1lLCBFeGNlcHRpb25Db2RlJik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0 aW9uLmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5l Y3Rpb24uaWRsCmluZGV4IDQyMTgyNDNlNGVmMTliZjA0MzM3YTdiODBhNTdlZTMzNzIzNDM2NGEu LjgxYzYyOGY3NDM1MDY1ZmNmZjUzMTIwYTU4MjU1ZjdjZjdjNDE4NzcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaWRsCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24u aWRsCkBAIC0zMSwxNSArMzEsMTUgQEAKIFsKICAgICBDb25kaXRpb25hbD1NRURJQV9TVFJFQU0s CiAgICAgQWN0aXZlRE9NT2JqZWN0LAotICAgIENvbnN0cnVjdG9yKGluIERpY3Rpb25hcnkgcnRj SWNlU2VydmVycywgaW4gW09wdGlvbmFsPURlZmF1bHRJc1VuZGVmaW5lZF0gRGljdGlvbmFyeSBt ZWRpYUNvbnN0cmFpbnRzKSwKKyAgICBDb25zdHJ1Y3RvcihpbiBEaWN0aW9uYXJ5IHJ0Y0ljZVNl cnZlcnMsIGluIFtPcHRpb25hbF0gRGljdGlvbmFyeSBtZWRpYUNvbnN0cmFpbnRzKSwKICAgICBD b25zdHJ1Y3RvclJhaXNlc0V4Y2VwdGlvbiwKICAgICBDYWxsV2l0aD1TY3JpcHRFeGVjdXRpb25D b250ZXh0LAogICAgIEV2ZW50VGFyZ2V0CiBdIGludGVyZmFjZSBSVENQZWVyQ29ubmVjdGlvbiB7 Ci0gICAgdm9pZCBjcmVhdGVPZmZlcihpbiBbQ2FsbGJhY2tdIFJUQ1Nlc3Npb25EZXNjcmlwdGlv bkNhbGxiYWNrIHN1Y2Nlc3NDYWxsYmFjaywgaW4gW0NhbGxiYWNrLE9wdGlvbmFsPURlZmF1bHRJ c1VuZGVmaW5lZF0gUlRDRXJyb3JDYWxsYmFjayBmYWlsdXJlQ2FsbGJhY2ssIGluIFtPcHRpb25h bD1EZWZhdWx0SXNVbmRlZmluZWRdIERpY3Rpb25hcnkgbWVkaWFDb25zdHJhaW50cykKKyAgICB2 b2lkIGNyZWF0ZU9mZmVyKGluIFtDYWxsYmFja10gUlRDU2Vzc2lvbkRlc2NyaXB0aW9uQ2FsbGJh Y2sgc3VjY2Vzc0NhbGxiYWNrLCBpbiBbQ2FsbGJhY2ssT3B0aW9uYWw9RGVmYXVsdElzVW5kZWZp bmVkXSBSVENFcnJvckNhbGxiYWNrIGZhaWx1cmVDYWxsYmFjaywgaW4gW09wdGlvbmFsXSBEaWN0 aW9uYXJ5IG1lZGlhQ29uc3RyYWludHMpCiAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwog Ci0gICAgdm9pZCBjcmVhdGVBbnN3ZXIoaW4gW0NhbGxiYWNrXSBSVENTZXNzaW9uRGVzY3JpcHRp b25DYWxsYmFjayBzdWNjZXNzQ2FsbGJhY2ssIGluIFtDYWxsYmFjaywgT3B0aW9uYWw9RGVmYXVs dElzVW5kZWZpbmVkXSBSVENFcnJvckNhbGxiYWNrIGZhaWx1cmVDYWxsYmFjaywgaW4gW09wdGlv bmFsPURlZmF1bHRJc1VuZGVmaW5lZF0gRGljdGlvbmFyeSBtZWRpYUNvbnN0cmFpbnRzKQorICAg IHZvaWQgY3JlYXRlQW5zd2VyKGluIFtDYWxsYmFja10gUlRDU2Vzc2lvbkRlc2NyaXB0aW9uQ2Fs bGJhY2sgc3VjY2Vzc0NhbGxiYWNrLCBpbiBbQ2FsbGJhY2ssIE9wdGlvbmFsPURlZmF1bHRJc1Vu ZGVmaW5lZF0gUlRDRXJyb3JDYWxsYmFjayBmYWlsdXJlQ2FsbGJhY2ssIGluIFtPcHRpb25hbF0g RGljdGlvbmFyeSBtZWRpYUNvbnN0cmFpbnRzKQogICAgICAgICByYWlzZXMoRE9NRXhjZXB0aW9u KTsKIAogICAgIHZvaWQgc2V0TG9jYWxEZXNjcmlwdGlvbihpbiBSVENTZXNzaW9uRGVzY3JpcHRp b24gZGVzY3JpcHRpb24sIGluIFtDYWxsYmFjaywgT3B0aW9uYWw9RGVmYXVsdElzVW5kZWZpbmVk XSBWb2lkQ2FsbGJhY2sgc3VjY2Vzc0NhbGxiYWNrLCBpbiBbQ2FsbGJhY2ssIE9wdGlvbmFsPURl ZmF1bHRJc1VuZGVmaW5lZF0gUlRDRXJyb3JDYWxsYmFjayBmYWlsdXJlQ2FsbGJhY2spCkBAIC01 NCw3ICs1NCw3IEBACiAKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIHJlYWR5U3Rh dGU7CiAKLSAgICB2b2lkIHVwZGF0ZUljZShpbiBbT3B0aW9uYWw9RGVmYXVsdElzVW5kZWZpbmVk XSBEaWN0aW9uYXJ5IGNvbmZpZ3VyYXRpb24sIGluIFtPcHRpb25hbD1EZWZhdWx0SXNVbmRlZmlu ZWRdIERpY3Rpb25hcnkgbWVkaWFDb25zdHJhaW50cykKKyAgICB2b2lkIHVwZGF0ZUljZShpbiBb T3B0aW9uYWxdIERpY3Rpb25hcnkgY29uZmlndXJhdGlvbiwgaW4gW09wdGlvbmFsXSBEaWN0aW9u YXJ5IG1lZGlhQ29uc3RyYWludHMpCiAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwogCiAg ICAgdm9pZCBhZGRJY2VDYW5kaWRhdGUoaW4gUlRDSWNlQ2FuZGlkYXRlIGNhbmRpZGF0ZSkKQEAg LTY1LDE0ICs2NSwxNCBAQAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBNZWRpYVN0cmVhbUxpc3Qg bG9jYWxTdHJlYW1zOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBNZWRpYVN0cmVhbUxpc3QgcmVt b3RlU3RyZWFtczsKIAotICAgIFtTdHJpY3RUeXBlQ2hlY2tpbmddIHZvaWQgYWRkU3RyZWFtKGlu IE1lZGlhU3RyZWFtIHN0cmVhbSwgaW4gW09wdGlvbmFsPURlZmF1bHRJc1VuZGVmaW5lZF0gRGlj dGlvbmFyeSBtZWRpYUNvbnN0cmFpbnRzKQorICAgIFtTdHJpY3RUeXBlQ2hlY2tpbmddIHZvaWQg YWRkU3RyZWFtKGluIE1lZGlhU3RyZWFtIHN0cmVhbSwgaW4gW09wdGlvbmFsXSBEaWN0aW9uYXJ5 IG1lZGlhQ29uc3RyYWludHMpCiAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwogICAgIFtT dHJpY3RUeXBlQ2hlY2tpbmddIHZvaWQgcmVtb3ZlU3RyZWFtKGluIE1lZGlhU3RyZWFtIHN0cmVh bSkKICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbik7CiAKICAgICB2b2lkIGdldFN0YXRzKGlu IFtDYWxsYmFja10gUlRDU3RhdHNDYWxsYmFjayBzdWNjZXNzQ2FsbGJhY2ssIGluIFtPcHRpb25h bD1EZWZhdWx0SXNVbmRlZmluZWRdIE1lZGlhU3RyZWFtVHJhY2sgc2VsZWN0b3IpOwogCi0gICAg UlRDRGF0YUNoYW5uZWwgY3JlYXRlRGF0YUNoYW5uZWwoaW4gW1RyZWF0TnVsbEFzPU51bGxTdHJp bmcsIFRyZWF0VW5kZWZpbmVkQXM9TnVsbFN0cmluZ10gRE9NU3RyaW5nIGxhYmVsLCBpbiBbT3B0 aW9uYWw9RGVmYXVsdElzVW5kZWZpbmVkXSBEaWN0aW9uYXJ5IG9wdGlvbnMpCisgICAgUlRDRGF0 YUNoYW5uZWwgY3JlYXRlRGF0YUNoYW5uZWwoaW4gW1RyZWF0TnVsbEFzPU51bGxTdHJpbmcsIFRy ZWF0VW5kZWZpbmVkQXM9TnVsbFN0cmluZ10gRE9NU3RyaW5nIGxhYmVsLCBpbiBbT3B0aW9uYWxd IERpY3Rpb25hcnkgb3B0aW9ucykKICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwogCiAg ICAgdm9pZCBjbG9zZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JKUy5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckpTLnBtCmluZGV4IDQ3NTRkM2Y1YTMzYTI2MTBjMGFiMWRkNTUwNjM1NzM0 NTIwZWJlYTIuLmFlMWM5OGJmMDQxMzQ4NjdiY2M1NDI2Y2ZhMDk2N2Q3YzllZjBmNmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt CkBAIC0yNjQ2LDEwICsyNjQ2LDEzIEBAIHN1YiBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjawogICAg ICRpbXBsSW5jbHVkZXN7IkpTRE9NQmluZGluZy5oIn0gPSAxOwogCiAgICAgZm9yZWFjaCBteSAk cGFyYW1ldGVyIChAeyRmdW5jdGlvbi0+cGFyYW1ldGVyc30pIHsKKyAgICAgICAgbXkgJGFyZ1R5 cGUgPSAkY29kZUdlbmVyYXRvci0+U3RyaXBNb2R1bGUoJHBhcmFtZXRlci0+dHlwZSk7CisKICAg ICAgICAgIyBPcHRpb25hbCBhcmd1bWVudHMgd2l0aCBbT3B0aW9uYWxdIHNob3VsZCBnZW5lcmF0 ZSBhbiBlYXJseSBjYWxsIHdpdGggZmV3ZXIgYXJndW1lbnRzLgogICAgICAgICAjIE9wdGlvbmFs IGFyZ3VtZW50cyB3aXRoIFtPcHRpb25hbD0uLi5dIHNob3VsZCBub3QgZ2VuZXJhdGUgdGhlIGVh cmx5IGNhbGwuCisgICAgICAgICMgT3B0aW9uYWwgRGljdGlvbmFyeSBhcmd1bWVudHMgYWx3YXlz IGNvbnNpZGVyZWQgdG8gaGF2ZSBkZWZhdWx0IG9mIGVtcHR5IGRpY3Rpb25hcnkuCiAgICAgICAg IG15ICRvcHRpb25hbCA9ICRwYXJhbWV0ZXItPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJPcHRpb25h bCJ9OwotICAgICAgICBpZiAoJG9wdGlvbmFsICYmICRvcHRpb25hbCBuZSAiRGVmYXVsdElzVW5k ZWZpbmVkIiAmJiAkb3B0aW9uYWwgbmUgIkRlZmF1bHRJc051bGxTdHJpbmciICYmICEkcGFyYW1l dGVyLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ2FsbGJhY2sifSkgeworICAgICAgICBpZiAoJG9w dGlvbmFsICYmICRvcHRpb25hbCBuZSAiRGVmYXVsdElzVW5kZWZpbmVkIiAmJiAkb3B0aW9uYWwg bmUgIkRlZmF1bHRJc051bGxTdHJpbmciICYmICRhcmdUeXBlIG5lICJEaWN0aW9uYXJ5IiAmJiAh JHBhcmFtZXRlci0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNhbGxiYWNrIn0pIHsKICAgICAgICAg ICAgICMgR2VuZXJhdGUgZWFybHkgY2FsbCBpZiB0aGVyZSBhcmUgZW5vdWdoIHBhcmFtZXRlcnMu CiAgICAgICAgICAgICBpZiAoISRoYXNPcHRpb25hbEFyZ3VtZW50cykgewogICAgICAgICAgICAg ICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIlxuICAgIHNpemVfdCBhcmdzQ291bnQgPSBleGVjLT5h cmd1bWVudENvdW50KCk7XG4iKTsKQEAgLTI2NjcsNyArMjY3MCw2IEBAIHN1YiBHZW5lcmF0ZVBh cmFtZXRlcnNDaGVjawogICAgICAgICB9CiAKICAgICAgICAgbXkgJG5hbWUgPSAkcGFyYW1ldGVy LT5uYW1lOwotICAgICAgICBteSAkYXJnVHlwZSA9ICRjb2RlR2VuZXJhdG9yLT5TdHJpcE1vZHVs ZSgkcGFyYW1ldGVyLT50eXBlKTsKIAogICAgICAgICBpZiAoJGFyZ1R5cGUgZXEgIlhQYXRoTlNS ZXNvbHZlciIpIHsKICAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBSZWZQdHI8 WFBhdGhOU1Jlc29sdmVyPiBjdXN0b21SZXNvbHZlcjtcbiIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQppbmRleCBkZmQ0NGNkNmNk ODgzNzZlYTc5MGQwZTFkYjhhNDM4YTcxNmYwNTU5Li4xNjZiMGM0NjcwZGRiMjQ5NjMyYjUzODg2 YmI4MTRlNGM5YjI1M2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAtMTcwOCwxMyArMTcwOCwxMyBAQCBzdWIgR2VuZXJh dGVQYXJhbWV0ZXJzQ2hlY2sKIAogICAgIGZvcmVhY2ggbXkgJHBhcmFtZXRlciAoQHskZnVuY3Rp b24tPnBhcmFtZXRlcnN9KSB7CiAgICAgICAgIFRyYW5zbGF0ZVBhcmFtZXRlcigkcGFyYW1ldGVy KTsKLQotICAgICAgICBteSAkcGFyYW1ldGVyTmFtZSA9ICRwYXJhbWV0ZXItPm5hbWU7CisgICAg ICAgIG15ICRuYXRpdmVUeXBlID0gR2V0TmF0aXZlVHlwZUZyb21TaWduYXR1cmUoJHBhcmFtZXRl ciwgJHBhcmFtSW5kZXgpOwogCiAgICAgICAgICMgT3B0aW9uYWwgYXJndW1lbnRzIHdpdGggW09w dGlvbmFsXSBzaG91bGQgZ2VuZXJhdGUgYW4gZWFybHkgY2FsbCB3aXRoIGZld2VyIGFyZ3VtZW50 cy4KICAgICAgICAgIyBPcHRpb25hbCBhcmd1bWVudHMgd2l0aCBbT3B0aW9uYWw9Li4uXSBzaG91 bGQgbm90IGdlbmVyYXRlIHRoZSBlYXJseSBjYWxsLgorICAgICAgICAjIE9wdGlvbmFsIERpY3Rp b25hcnkgYXJndW1lbnRzIGFsd2F5cyBjb25zaWRlcmVkIHRvIGhhdmUgZGVmYXVsdCBvZiBlbXB0 eSBkaWN0aW9uYXJ5LgogICAgICAgICBteSAkb3B0aW9uYWwgPSAkcGFyYW1ldGVyLT5leHRlbmRl ZEF0dHJpYnV0ZXMtPnsiT3B0aW9uYWwifTsKLSAgICAgICAgaWYgKCRvcHRpb25hbCAmJiAkb3B0 aW9uYWwgbmUgIkRlZmF1bHRJc1VuZGVmaW5lZCIgJiYgJG9wdGlvbmFsIG5lICJEZWZhdWx0SXNO dWxsU3RyaW5nIiAmJiAhJHBhcmFtZXRlci0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNhbGxiYWNr In0pIHsKKyAgICAgICAgaWYgKCRvcHRpb25hbCAmJiAkb3B0aW9uYWwgbmUgIkRlZmF1bHRJc1Vu ZGVmaW5lZCIgJiYgJG9wdGlvbmFsIG5lICJEZWZhdWx0SXNOdWxsU3RyaW5nIiAmJiAkbmF0aXZl VHlwZSBuZSAiRGljdGlvbmFyeSIgJiYgISRwYXJhbWV0ZXItPmV4dGVuZGVkQXR0cmlidXRlcy0+ eyJDYWxsYmFjayJ9KSB7CiAgICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAg ICBpZiAoYXJncy5MZW5ndGgoKSA8PSAkcGFyYW1JbmRleCkge1xuIjsKICAgICAgICAgICAgIG15 ICRmdW5jdGlvbkNhbGwgPSBHZW5lcmF0ZUZ1bmN0aW9uQ2FsbFN0cmluZygkZnVuY3Rpb24sICRw YXJhbUluZGV4LCAiICAgICIgeCAyLCAkaW1wbENsYXNzTmFtZSwgJXJlcGxhY2VtZW50cyk7CiAg ICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gJGZ1bmN0aW9uQ2FsbDsKQEAgLTE3 MjYsNiArMTcyNiw3IEBAIHN1YiBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjawogICAgICAgICAgICAg JHBhcmFtZXRlckRlZmF1bHRQb2xpY3kgPSAiRGVmYXVsdElzTnVsbFN0cmluZyI7CiAgICAgICAg IH0KIAorICAgICAgICBteSAkcGFyYW1ldGVyTmFtZSA9ICRwYXJhbWV0ZXItPm5hbWU7CiAgICAg ICAgIGlmIChHZXRJbmRleE9mKCRwYXJhbWV0ZXJOYW1lLCBAcGFyYW1UcmFuc2Zlckxpc3ROYW1l cykgIT0gLTEpIHsKICAgICAgICAgICAgICRyZXBsYWNlbWVudHN7JHBhcmFtZXRlck5hbWV9ID0g Im1lc3NhZ2VQb3J0QXJyYXkiIC4gdWNmaXJzdCgkcGFyYW1ldGVyTmFtZSk7CiAgICAgICAgICAg ICAkcGFyYW1JbmRleCsrOwpAQCAtMTczMyw3ICsxNzM0LDYgQEAgc3ViIEdlbmVyYXRlUGFyYW1l dGVyc0NoZWNrCiAgICAgICAgIH0KIAogICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiRXhjZXB0 aW9uQ29kZS5oIik7Ci0gICAgICAgIG15ICRuYXRpdmVUeXBlID0gR2V0TmF0aXZlVHlwZUZyb21T aWduYXR1cmUoJHBhcmFtZXRlciwgJHBhcmFtSW5kZXgpOwogICAgICAgICBpZiAoJHBhcmFtZXRl ci0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNhbGxiYWNrIn0pIHsKICAgICAgICAgICAgIG15ICRj bGFzc05hbWUgPSBHZXRDYWxsYmFja0NsYXNzTmFtZSgkcGFyYW1ldGVyLT50eXBlKTsKICAgICAg ICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzKCIkY2xhc3NOYW1lLmgiKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAKaW5kZXgg ZTA2ZDRiYjAxYTBlNGU5NTM1MDVkZGEzYmIyMzRkNThjOGU3NzU0Ny4uMzE5NTViYWUyN2NiNWJj ZDliM2ExMjA1OTM2MmU2ZjJjZjU3YjA4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAKQEAgLTE2MzYsMTMgKzE2MzYs NiBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0 aW9uT3B0aW9uc09iamVjdChFeGVjU3RhdGUqCiAgICAgRGljdGlvbmFyeSBvbyhleGVjLCBNQVlC RV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAwLCBEZWZhdWx0SXNVbmRlZmluZWQpKTsKICAgICBp ZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUo anNVbmRlZmluZWQoKSk7Ci0KLSAgICBzaXplX3QgYXJnc0NvdW50ID0gZXhlYy0+YXJndW1lbnRD b3VudCgpOwotICAgIGlmIChhcmdzQ291bnQgPD0gMSkgewotICAgICAgICBpbXBsLT5vcHRpb25z T2JqZWN0KG9vKTsKLSAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgp KTsKLSAgICB9Ci0KICAgICBEaWN0aW9uYXJ5IG9vbyhleGVjLCBNQVlCRV9NSVNTSU5HX1BBUkFN RVRFUihleGVjLCAxLCBEZWZhdWx0SXNVbmRlZmluZWQpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhj ZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhU ZXN0T2JqLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRl c3RPYmouY3BwCmluZGV4IDIzYmExZjE5MmI0NTI2YTk5OTViMjM5YmI0NWUxNjdlMjZjYTA2M2Iu LjQ1MzhmYmJhODQ4ZTJmZDcyOWE4YWU0NzhmYjkzMTY0ZGM1NDNkZGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCkBA IC0xMTczLDEwICsxMTczLDYgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBvcHRpb25z T2JqZWN0Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICBFWENFUFRJT05f QkxPQ0soRGljdGlvbmFyeSwgb28sIERpY3Rpb25hcnkoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIo YXJncywgMCwgRGVmYXVsdElzVW5kZWZpbmVkKSwgYXJncy5HZXRJc29sYXRlKCkpKTsKICAgICBp ZiAoIW9vLmlzVW5kZWZpbmVkT3JOdWxsKCkgJiYgIW9vLmlzT2JqZWN0KCkpCiAgICAgICAgIHJl dHVybiB0aHJvd1R5cGVFcnJvcigiTm90IGFuIG9iamVjdC4iLCBhcmdzLkdldElzb2xhdGUoKSk7 Ci0gICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPD0gMSkgewotICAgICAgICBpbXAtPm9wdGlvbnNPYmpl Y3Qob28pOwotICAgICAgICByZXR1cm4gdjhVbmRlZmluZWQoKTsKLSAgICB9CiAgICAgRVhDRVBU SU9OX0JMT0NLKERpY3Rpb25hcnksIG9vbywgRGljdGlvbmFyeShNQVlCRV9NSVNTSU5HX1BBUkFN RVRFUihhcmdzLCAxLCBEZWZhdWx0SXNVbmRlZmluZWQpLCBhcmdzLkdldElzb2xhdGUoKSkpOwog ICAgIGlmICghb29vLmlzVW5kZWZpbmVkT3JOdWxsKCkgJiYgIW9vby5pc09iamVjdCgpKQogICAg ICAgICByZXR1cm4gdGhyb3dUeXBlRXJyb3IoIk5vdCBhbiBvYmplY3QuIiwgYXJncy5HZXRJc29s YXRlKCkpOwo=