59431 2011-04-26 00:22:22 -0700 Fix a few OwnPtr strict errors in WebCore headers. 2011-04-26 00:31:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 levin levin oldest_to_newest 392322 0 levin 2011-04-26 00:22:22 -0700 Fix a few OwnPtr strict errors in WebCore headers. 392324 1 91076 levin 2011-04-26 00:22:50 -0700 Created attachment 91076 Patch 392333 2 levin 2011-04-26 00:31:56 -0700 Committed as http://trac.webkit.org/changeset/84892 91076 2011-04-26 00:22:50 -0700 2011-04-26 00:26:08 -0700 Patch bug-59431-20110426002249.patch text/plain 17889 levin U3VidmVyc2lvbiBSZXZpc2lvbjogODQ4ODgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzZGRjODNhOTBmZWQxMzk4 YjgxNjEyMjA1NzVhNmRkZjRkYzlkMGYyLi4zM2EwNjU0YmI4Y2UyZWEwMjUyMDY1ZWI0MzMyNDJk ZTY2YjNlYzlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTAgQEAKKzIwMTEtMDQtMjYgIERhdmlk IExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCBhIGZldyBPd25QdHIgc3RyaWN0IGVycm9ycyBpbiBX ZWJDb3JlIGhlYWRlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01OTQzMQorCisgICAgICAgICogYmluZGluZ3MvanMvU2NoZWR1bGVkQWN0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjaGVkdWxlZEFjdGlvbjo6Y3JlYXRlKToKKyAgICAgICAg KiBjc3MvTWVkaWFRdWVyeU1hdGNoZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFRdWVy eU1hdGNoZXI6OnByZXBhcmVFdmFsdWF0b3IpOgorICAgICAgICAqIGRvbS9Ob2RlUmFyZURhdGEu aDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVMaXN0c05vZGVEYXRhOjpjcmVhdGUpOgorICAgICAg ICAqIGRvbS9TY3JpcHRSdW5uZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdFJ1bm5lcjo6 Y3JlYXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvV29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyOjpjb25uZWN0 RnJvbnRlbmQpOgorICAgICAgICAqIGxvYWRlci9pY29uL0ljb25EYXRhYmFzZS5oOgorICAgICAg ICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpjcmVhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL1NpbXBsZUZvbnREYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnRE YXRhOjp2ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb25Gb250RGF0YSk6CisgICAgICAgIChXZWJDb3Jl OjpTaW1wbGVGb250RGF0YTo6dXByaWdodE9yaWVudGF0aW9uRm9udERhdGEpOgorICAgICAgICAo V2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmJyb2tlbklkZW9ncmFwaEZvbnREYXRhKToKKyAgICAg ICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRhOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRh KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1NWR1Jlc291cmNlcy5oOgorICAgICAgICAoV2Vi Q29yZTo6U1ZHUmVzb3VyY2VzOjpDbGlwcGVyRmlsdGVyTWFza2VyRGF0YTo6Y3JlYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNWR1Jlc291cmNlczo6TWFya2VyRGF0YTo6Y3JlYXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OlNWR1Jlc291cmNlczo6RmlsbFN0cm9rZURhdGE6OmNyZWF0ZSk6CisgICAg ICAgICogc3RvcmFnZS9TdG9yYWdlU3luY01hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U3RvcmFnZVN5bmNNYW5hZ2VyOjpjbG9zZSk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXJDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNsb3NlV29ya2VyQ29udGV4dFRhc2s6OmNyZWF0 ZSk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpNZXNzYWdlV29ya2VyQ29udGV4dFRhc2s6OmNyZWF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpNZXNzYWdlV29ya2VyVGFzazo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlckV4Y2VwdGlvblRhc2s6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJDb250 ZXh0RGVzdHJveWVkVGFzazo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRlcm1p bmF0ZVRhc2s6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJUaHJlYWRBY3Rpdml0 eVJlcG9ydFRhc2s6OmNyZWF0ZSk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXJSdW5Mb29wLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclJ1bkxvb3A6OlRhc2s6OmNyZWF0ZSk6CisgICAg ICAgICogd29ya2Vycy9Xb3JrZXJUaHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2Vy VGhyZWFkU3RhcnR1cERhdGE6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJUaHJl YWRTaHV0ZG93bkZpbmlzaFRhc2s6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJU aHJlYWRTaHV0ZG93blN0YXJ0VGFzazo6Y3JlYXRlKToKKwogMjAxMS0wNC0yNSAgRGF2aWQgTGV2 aW4gIDxsZXZpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0 aC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjaGVkdWxlZEFjdGlv bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY2hlZHVsZWRBY3Rpb24uY3BwCmlu ZGV4IGI4YTYyM2JjMzczMzkxN2ZiOTE5N2MxYzg5M2IyNmQwZjAyYjdhNTUuLmExNWQ3MWFjZDEz MWMxYmI0NTNjZGMxM2VhMDlmOWJhZTNkOTc5N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1NjaGVkdWxlZEFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NoZWR1bGVkQWN0aW9uLmNwcApAQCAtNTMsMTQgKzUzLDE0IEBAIFBhc3NPd25Q dHI8U2NoZWR1bGVkQWN0aW9uPiBTY2hlZHVsZWRBY3Rpb246OmNyZWF0ZShFeGVjU3RhdGUqIGV4 ZWMsIERPTVdyYXBwZXJXCiAgICAgQ2FsbERhdGEgY2FsbERhdGE7CiAgICAgaWYgKGdldENhbGxE YXRhKHYsIGNhbGxEYXRhKSA9PSBDYWxsVHlwZU5vbmUpIHsKICAgICAgICAgaWYgKHBvbGljeSAm JiAhcG9saWN5LT5hbGxvd0V2YWwoKSkKLSAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAg ICAgcmV0dXJuIFBhc3NPd25QdHI8U2NoZWR1bGVkQWN0aW9uPigpOwogICAgICAgICBVU3RyaW5n IHN0cmluZyA9IHYudG9TdHJpbmcoZXhlYyk7CiAgICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRp b24oKSkKLSAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICByZXR1cm4gbmV3IFNjaGVkdWxl ZEFjdGlvbih1c3RyaW5nVG9TdHJpbmcoc3RyaW5nKSwgaXNvbGF0ZWRXb3JsZCk7CisgICAgICAg ICAgICByZXR1cm4gUGFzc093blB0cjxTY2hlZHVsZWRBY3Rpb24+KCk7CisgICAgICAgIHJldHVy biBhZG9wdFB0cihuZXcgU2NoZWR1bGVkQWN0aW9uKHVzdHJpbmdUb1N0cmluZyhzdHJpbmcpLCBp c29sYXRlZFdvcmxkKSk7CiAgICAgfQogCi0gICAgcmV0dXJuIG5ldyBTY2hlZHVsZWRBY3Rpb24o ZXhlYywgdiwgaXNvbGF0ZWRXb3JsZCk7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBTY2hlZHVs ZWRBY3Rpb24oZXhlYywgdiwgaXNvbGF0ZWRXb3JsZCkpOwogfQogCiBTY2hlZHVsZWRBY3Rpb246 OlNjaGVkdWxlZEFjdGlvbihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgZnVuY3Rpb24sIERPTVdy YXBwZXJXb3JsZCogaXNvbGF0ZWRXb3JsZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9NZWRpYVF1ZXJ5TWF0Y2hlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvTWVkaWFRdWVyeU1h dGNoZXIuY3BwCmluZGV4IGM0NDdmMzg2NDI4ZjVhNmE2ZGU0NmE3YzY2Y2M1M2E5ODMxZjM2MWIu LjZiYjdmMmI2MWRmNmVhNmI5ZTk5MjI3MjAwYzI5OGQ5YmJkZDI5NTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5TWF0Y2hlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL01lZGlhUXVlcnlNYXRjaGVyLmNwcApAQCAtNzcsMTUgKzc3LDE1IEBAIFN0cmluZyBN ZWRpYVF1ZXJ5TWF0Y2hlcjo6bWVkaWFUeXBlKCkgY29uc3QKIFBhc3NPd25QdHI8TWVkaWFRdWVy eUV2YWx1YXRvcj4gTWVkaWFRdWVyeU1hdGNoZXI6OnByZXBhcmVFdmFsdWF0b3IoKSBjb25zdAog ewogICAgIGlmICghbV9kb2N1bWVudCB8fCAhbV9kb2N1bWVudC0+ZnJhbWUoKSkKLSAgICAgICAg cmV0dXJuIDA7CisgICAgICAgIHJldHVybiBQYXNzT3duUHRyPE1lZGlhUXVlcnlFdmFsdWF0b3I+ KCk7CiAKICAgICBFbGVtZW50KiBkb2N1bWVudEVsZW1lbnQgPSBtX2RvY3VtZW50LT5kb2N1bWVu dEVsZW1lbnQoKTsKICAgICBpZiAoIWRvY3VtZW50RWxlbWVudCkKLSAgICAgICAgcmV0dXJuIDA7 CisgICAgICAgIHJldHVybiBQYXNzT3duUHRyPE1lZGlhUXVlcnlFdmFsdWF0b3I+KCk7CiAKICAg ICBDU1NTdHlsZVNlbGVjdG9yKiBzdHlsZVNlbGVjdG9yID0gbV9kb2N1bWVudC0+c3R5bGVTZWxl Y3RvcigpOwogICAgIGlmICghc3R5bGVTZWxlY3RvcikKLSAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIHJldHVybiBQYXNzT3duUHRyPE1lZGlhUXVlcnlFdmFsdWF0b3I+KCk7CiAKICAgICBSZWZQ dHI8UmVuZGVyU3R5bGU+IHJvb3RTdHlsZSA9IHN0eWxlU2VsZWN0b3ItPnN0eWxlRm9yRWxlbWVu dChkb2N1bWVudEVsZW1lbnQsIDAgLypkZWZhdWx0UGFyZW50Ki8sIGZhbHNlIC8qYWxsb3dTaGFy aW5nKi8sIHRydWUgLypyZXNvbHZlRm9yUm9vdERlZmF1bHQqLyk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmFyZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2Rl UmFyZURhdGEuaAppbmRleCBjNTQyOWZkOTNlYmVkZjcxMzQ5ZGE5YTI4MTk5YTk5NzAxZGUxZjlk Li4yN2ZmNzk2MWYwNjU2MjQzNDc3NTBmMTQ3NjY0YjE0MWRkYjZjMDIxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vTm9kZVJhcmVEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L05vZGVSYXJlRGF0YS5oCkBAIC02MSw3ICs2MSw3IEBAIHB1YmxpYzoKICAKICAgICBzdGF0aWMg UGFzc093blB0cjxOb2RlTGlzdHNOb2RlRGF0YT4gY3JlYXRlKCkKICAgICB7Ci0gICAgICAgIHJl dHVybiBuZXcgTm9kZUxpc3RzTm9kZURhdGE7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcg Tm9kZUxpc3RzTm9kZURhdGEpOwogICAgIH0KICAgICAKICAgICB2b2lkIGludmFsaWRhdGVDYWNo ZXMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRSdW5uZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRSdW5uZXIuaAppbmRleCBkNmQ3NDExNTA4ZjI1ZjNhODMy ZDA0NzZkODZiYzZhNGQ2ZWMzNmI1Li5iYjY2YWQ0YzZjNWIzMWRlYTgzNGQwYzhlNWE3YTBiNzVl OWI5OTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0UnVubmVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdFJ1bm5lci5oCkBAIC0yOSw2ICsyOSw3IEBACiAj aW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VIYW5kbGUuaCIKICNpbmNsdWRlICJUaW1lci5oIgogI2lu Y2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgorI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAj aW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKQEAg LTQyLDcgKzQzLDcgQEAgY2xhc3MgU2NyaXB0RWxlbWVudDsKIGNsYXNzIFNjcmlwdFJ1bm5lciB7 CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU2NyaXB0UnVubmVyKTsgV1RGX01BS0VfRkFTVF9B TExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8U2NyaXB0UnVubmVyPiBj cmVhdGUoRG9jdW1lbnQqIGRvY3VtZW50KSB7IHJldHVybiBuZXcgU2NyaXB0UnVubmVyKGRvY3Vt ZW50KTsgfQorICAgIHN0YXRpYyBQYXNzT3duUHRyPFNjcmlwdFJ1bm5lcj4gY3JlYXRlKERvY3Vt ZW50KiBkb2N1bWVudCkgeyByZXR1cm4gYWRvcHRQdHIobmV3IFNjcmlwdFJ1bm5lcihkb2N1bWVu dCkpOyB9CiAgICAgflNjcmlwdFJ1bm5lcigpOwogCiAgICAgZW51bSBFeGVjdXRpb25UeXBlIHsg QVNZTkNfRVhFQ1VUSU9OLCBJTl9PUkRFUl9FWEVDVVRJT04gfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCAx ZWY5MjQ1MWY4NTY1OWY3Y2NmZjYwMWVkZmU0ZWE0NjZlZGM0MWE0Li5hM2U3N2I3ODc1NDI5Y2M0 OTkyMWQ2NDEyMDg3MDZmZWJlZDc2NjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvV29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL1dvcmtlckluc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xMDAsOCArMTAwLDgg QEAgdm9pZCBXb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyOjpjb25uZWN0RnJvbnRlbmQoSW5zcGVj dG9yRnJvbnRlbmRDaGFubmVsKiBjaGFubmUKIHsKICAgICBBU1NFUlQoIW1fZnJvbnRlbmQpOwog ICAgIG1fc3RhdGUtPnVubXV0ZSgpOwotICAgIG1fZnJvbnRlbmQgPSBuZXcgSW5zcGVjdG9yRnJv bnRlbmQoY2hhbm5lbCk7Ci0gICAgbV9iYWNrZW5kRGlzcGF0Y2hlciA9IG5ldyBJbnNwZWN0b3JC YWNrZW5kRGlzcGF0Y2hlcigKKyAgICBtX2Zyb250ZW5kID0gYWRvcHRQdHIobmV3IEluc3BlY3Rv ckZyb250ZW5kKGNoYW5uZWwpKTsKKyAgICBtX2JhY2tlbmREaXNwYXRjaGVyID0gYWRvcHRQdHIo bmV3IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyKAogICAgICAgICBjaGFubmVsLAogI2lmIEVO QUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCiAgICAgICAgIDAsIC8vIEluc3BlY3RvckFw cGxpY2F0aW9uQ2FjaGVBZ2VudApAQCAtMTI5LDcgKzEyOSw3IEBAIHZvaWQgV29ya2VySW5zcGVj dG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kQ2hhbm5lbCog Y2hhbm5lCiAgICAgICAgIG1fcnVudGltZUFnZW50LmdldCgpLAogICAgICAgICAwLCAvLyBJbnNw ZWN0b3JUaW1lbGluZUFnZW50CiAgICAgICAgIDAgLy8gSW5zcGVjdG9yV29ya2VyQWdlbnQKLSAg ICApOworICAgICkpOwogCiAgICAgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPmluamVjdGVkU2Ny aXB0SG9zdCgpLT5zZXRGcm9udGVuZChtX2Zyb250ZW5kLmdldCgpKTsKICNpZiBFTkFCTEUoSkFW QVNDUklQVF9ERUJVR0dFUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29u L0ljb25EYXRhYmFzZS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNl LmgKaW5kZXggNzM5MjI0NWY4ZmUyZWFlZTJmMDk3YTM4N2M2ZjEzMGE5MDdiMjQ5ZS4uYjU5Mzc2 NDlkOGMzNjg5NWNhMWQwYmY2MDdlZTVhMTA0YmJiM2Q0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgKQEAgLTczLDcgKzczLDcgQEAgY2xhc3MgSWNvbkRhdGFi YXNlIDogcHVibGljIEljb25EYXRhYmFzZUJhc2UgewogICAgIAogLy8gKioqIE1haW4gVGhyZWFk IE9ubHkgKioqCiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8SWNvbkRhdGFiYXNlPiBj cmVhdGUoKSB7IHJldHVybiBuZXcgSWNvbkRhdGFiYXNlOyB9CisgICAgc3RhdGljIFBhc3NPd25Q dHI8SWNvbkRhdGFiYXNlPiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFB0cihuZXcgSWNvbkRhdGFi YXNlKTsgfQogICAgIH5JY29uRGF0YWJhc2UoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDbGll bnQoSWNvbkRhdGFiYXNlQ2xpZW50Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5jcHAKaW5kZXggN2NjNDA5ZDJkYjVmMjljMGMyOWE2 Y2I4YzdiY2RhNWRjNDA4YTFjZC4uZjJhMDZmNDU4YTAyYjAzN2VlOGFmYzdmNGJjZmZjM2FkZTUx MWMwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxl Rm9udERhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBs ZUZvbnREYXRhLmNwcApAQCAtMjExLDcgKzIxMSw3IEBAIFNpbXBsZUZvbnREYXRhKiBTaW1wbGVG b250RGF0YTo6dmVydGljYWxSaWdodE9yaWVudGF0aW9uRm9udERhdGEoKSBjb25zdAogICAgIGlm ICghbV9kZXJpdmVkRm9udERhdGEtPnZlcnRpY2FsUmlnaHRPcmllbnRhdGlvbikgewogICAgICAg ICBGb250UGxhdGZvcm1EYXRhIHZlcnRpY2FsUmlnaHRQbGF0Zm9ybURhdGEobV9wbGF0Zm9ybURh dGEpOwogICAgICAgICB2ZXJ0aWNhbFJpZ2h0UGxhdGZvcm1EYXRhLnNldE9yaWVudGF0aW9uKEhv cml6b250YWwpOwotICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+dmVydGljYWxSaWdodE9yaWVu dGF0aW9uID0gbmV3IFNpbXBsZUZvbnREYXRhKHZlcnRpY2FsUmlnaHRQbGF0Zm9ybURhdGEsIGlz Q3VzdG9tRm9udCgpLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT52 ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb24gPSBhZG9wdFB0cihuZXcgU2ltcGxlRm9udERhdGEodmVy dGljYWxSaWdodFBsYXRmb3JtRGF0YSwgaXNDdXN0b21Gb250KCksIGZhbHNlLCB0cnVlKSk7CiAg ICAgfQogICAgIHJldHVybiBtX2Rlcml2ZWRGb250RGF0YS0+dmVydGljYWxSaWdodE9yaWVudGF0 aW9uLmdldCgpOwogfQpAQCAtMjIxLDcgKzIyMSw3IEBAIFNpbXBsZUZvbnREYXRhKiBTaW1wbGVG b250RGF0YTo6dXByaWdodE9yaWVudGF0aW9uRm9udERhdGEoKSBjb25zdAogICAgIGlmICghbV9k ZXJpdmVkRm9udERhdGEpCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gRGVyaXZlZEZvbnRE YXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEt PnVwcmlnaHRPcmllbnRhdGlvbikKLSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnVwcmlnaHRP cmllbnRhdGlvbiA9IG5ldyBTaW1wbGVGb250RGF0YShtX3BsYXRmb3JtRGF0YSwgaXNDdXN0b21G b250KCksIGZhbHNlLCB0cnVlKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnVwcmlnaHRP cmllbnRhdGlvbiA9IGFkb3B0UHRyKG5ldyBTaW1wbGVGb250RGF0YShtX3BsYXRmb3JtRGF0YSwg aXNDdXN0b21Gb250KCksIGZhbHNlLCB0cnVlKSk7CiAgICAgcmV0dXJuIG1fZGVyaXZlZEZvbnRE YXRhLT51cHJpZ2h0T3JpZW50YXRpb24uZ2V0KCk7CiB9CiAKQEAgLTIzMCw3ICsyMzAsNyBAQCBT aW1wbGVGb250RGF0YSogU2ltcGxlRm9udERhdGE6OmJyb2tlbklkZW9ncmFwaEZvbnREYXRhKCkg Y29uc3QKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhKQogICAgICAgICBtX2Rlcml2ZWRGb250 RGF0YSA9IERlcml2ZWRGb250RGF0YTo6Y3JlYXRlKGlzQ3VzdG9tRm9udCgpKTsKICAgICBpZiAo IW1fZGVyaXZlZEZvbnREYXRhLT5icm9rZW5JZGVvZ3JhcGgpIHsKLSAgICAgICAgbV9kZXJpdmVk Rm9udERhdGEtPmJyb2tlbklkZW9ncmFwaCA9IG5ldyBTaW1wbGVGb250RGF0YShtX3BsYXRmb3Jt RGF0YSwgaXNDdXN0b21Gb250KCksIGZhbHNlKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEt PmJyb2tlbklkZW9ncmFwaCA9IGFkb3B0UHRyKG5ldyBTaW1wbGVGb250RGF0YShtX3BsYXRmb3Jt RGF0YSwgaXNDdXN0b21Gb250KCksIGZhbHNlKSk7CiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRh LT5icm9rZW5JZGVvZ3JhcGgtPm1faXNCcm9rZW5JZGVvZ3JhcGhGYWxsYmFjayA9IHRydWU7CiAg ICAgfQogICAgIHJldHVybiBtX2Rlcml2ZWRGb250RGF0YS0+YnJva2VuSWRlb2dyYXBoLmdldCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUlu aGVyaXRlZERhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFy ZUluaGVyaXRlZERhdGEuY3BwCmluZGV4IDk0MGEwZDk5NzZiYTA3Yjg2YmEzYzZlNjg5M2UyYzI5 MjVmZmNlMzYuLjJhOGM1MDJjMmU4OGY5YjUwMThmOTNmY2E0YzBkYzIwNDcxOThkYzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWRE YXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5o ZXJpdGVkRGF0YS5jcHAKQEAgLTYzLDcgKzYzLDcgQEAgU3R5bGVSYXJlSW5oZXJpdGVkRGF0YTo6 U3R5bGVSYXJlSW5oZXJpdGVkRGF0YShjb25zdCBTdHlsZVJhcmVJbmhlcml0ZWREYXRhJiBvKQog ICAgICwgdGV4dFN0cm9rZVdpZHRoKG8udGV4dFN0cm9rZVdpZHRoKQogICAgICwgdGV4dEZpbGxD b2xvcihvLnRleHRGaWxsQ29sb3IpCiAgICAgLCB0ZXh0RW1waGFzaXNDb2xvcihvLnRleHRFbXBo YXNpc0NvbG9yKQotICAgICwgdGV4dFNoYWRvdyhvLnRleHRTaGFkb3cgPyBhZG9wdFB0cihuZXcg U2hhZG93RGF0YSgqby50ZXh0U2hhZG93KSkgOiAwKQorICAgICwgdGV4dFNoYWRvdyhvLnRleHRT aGFkb3cgPyBhZG9wdFB0cihuZXcgU2hhZG93RGF0YSgqby50ZXh0U2hhZG93KSkgOiBQYXNzT3du UHRyPFNoYWRvd0RhdGE+KCkpCiAgICAgLCBoaWdobGlnaHQoby5oaWdobGlnaHQpCiAgICAgLCBj dXJzb3JEYXRhKG8uY3Vyc29yRGF0YSkKICAgICAsIGluZGVudChvLmluZGVudCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVzb3VyY2VzLmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1Jlc291cmNlcy5oCmluZGV4IDQ4Y2NhMjM2MzgzZDMz Nzc2MmY4MGE2M2FiOGZjMGE5ZGYyMjZhNTMuLjA0ODIwM2NmYzk4YTU3YzIzZTZkMjU4MDIyOTVi NzRlOGYzZGE1ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZH UmVzb3VyY2VzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZXNvdXJj ZXMuaApAQCAtMTE4LDcgKzExOCw3IEBAIHByaXZhdGU6CiAKICAgICAgICAgc3RhdGljIFBhc3NP d25QdHI8Q2xpcHBlckZpbHRlck1hc2tlckRhdGE+IGNyZWF0ZSgpCiAgICAgICAgIHsKLSAgICAg ICAgICAgIHJldHVybiBuZXcgQ2xpcHBlckZpbHRlck1hc2tlckRhdGE7CisgICAgICAgICAgICBy ZXR1cm4gYWRvcHRQdHIobmV3IENsaXBwZXJGaWx0ZXJNYXNrZXJEYXRhKTsKICAgICAgICAgfQog CiAgICAgICAgIFJlbmRlclNWR1Jlc291cmNlQ2xpcHBlciogY2xpcHBlcjsKQEAgLTE0MCw3ICsx NDAsNyBAQCBwcml2YXRlOgogCiAgICAgICAgIHN0YXRpYyBQYXNzT3duUHRyPE1hcmtlckRhdGE+ IGNyZWF0ZSgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBuZXcgTWFya2VyRGF0YTsK KyAgICAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgTWFya2VyRGF0YSk7CiAgICAgICAgIH0K IAogICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZU1hcmtlciogbWFya2VyU3RhcnQ7CkBAIC0xNjEs NyArMTYxLDcgQEAgcHJpdmF0ZToKIAogICAgICAgICBzdGF0aWMgUGFzc093blB0cjxGaWxsU3Ry b2tlRGF0YT4gY3JlYXRlKCkKICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIG5ldyBGaWxs U3Ryb2tlRGF0YTsKKyAgICAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRmlsbFN0cm9rZURh dGEpOwogICAgICAgICB9CiAKICAgICAgICAgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIqIGZp bGw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VTeW5jTWFuYWdl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VTeW5jTWFuYWdlci5jcHAKaW5k ZXggMWNmODMwNmU5OGU1OGI2YzA0YjQ1NTFiZTYyOTM0Mzg1ZTNmYmJlYi4uYmUwOGQ0MzEzODk0 Y2MzMzViYzM4NjNiNjFkZWJhNDc5ZGU0NzJiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv c3RvcmFnZS9TdG9yYWdlU3luY01hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvU3RvcmFnZVN5bmNNYW5hZ2VyLmNwcApAQCAtNzksNyArNzksNyBAQCB2b2lkIFN0b3JhZ2VT eW5jTWFuYWdlcjo6Y2xvc2UoKQogCiAgICAgaWYgKG1fdGhyZWFkKSB7CiAgICAgICAgIG1fdGhy ZWFkLT50ZXJtaW5hdGUoKTsKLSAgICAgICAgbV90aHJlYWQgPSAwOworICAgICAgICBtX3RocmVh ZC5jbGVhcigpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9Xb3JrZXJDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQ29udGV4 dC5jcHAKaW5kZXggN2EzNjA0MmI0ZGU2YjJhZTBhNTlkMGYyMDk0NGI3NTViOGI2YzFhNi4uMWNm NTZiZjMxOTM5ODg1ODhjMTBjOTUyNDU1YWUyZDdhOGE0NmU3NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL1dvcmtlckNvbnRleHQuY3BwCkBAIC04OCw3ICs4OCw3IEBAIGNsYXNzIENsb3NlV29y a2VyQ29udGV4dFRhc2sgOiBwdWJsaWMgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzayB7CiBw dWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25QdHI8Q2xvc2VXb3JrZXJDb250ZXh0VGFzaz4gY3Jl YXRlKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgQ2xvc2VXb3JrZXJDb250ZXh0VGFzazsK KyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBDbG9zZVdvcmtlckNvbnRleHRUYXNrKTsKICAg ICB9CiAKICAgICB2aXJ0dWFsIHZvaWQgcGVyZm9ybVRhc2soU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCAqY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyTWVz c2FnaW5nUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQ cm94eS5jcHAKaW5kZXggZWNhOGUyZTcyMmU2ZmQxODQ2NGQyMDIyMTI1OGEwZDc5MWI3NTJmOS4u OWU3NmRiZWQxZjVmNGE1NmNjOTEzOGUwZmExZWRkMWY5ZjBlZDdlOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAKQEAgLTQ5LDcgKzQ5LDcg QEAgY2xhc3MgTWVzc2FnZVdvcmtlckNvbnRleHRUYXNrIDogcHVibGljIFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQ6OlRhc2sgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPE1lc3NhZ2VX b3JrZXJDb250ZXh0VGFzaz4gY3JlYXRlKFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVl PiBtZXNzYWdlLCBQYXNzT3duUHRyPE1lc3NhZ2VQb3J0Q2hhbm5lbEFycmF5PiBjaGFubmVscykK ICAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgTWVzc2FnZVdvcmtlckNvbnRleHRUYXNrKG1lc3Nh Z2UsIGNoYW5uZWxzKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBNZXNzYWdlV29ya2Vy Q29udGV4dFRhc2sobWVzc2FnZSwgY2hhbm5lbHMpKTsKICAgICB9CiAKIHByaXZhdGU6CkBAIC03 Nyw3ICs3Nyw3IEBAIGNsYXNzIE1lc3NhZ2VXb3JrZXJUYXNrIDogcHVibGljIFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQ6OlRhc2sgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPE1lc3Nh Z2VXb3JrZXJUYXNrPiBjcmVhdGUoUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IG1l c3NhZ2UsIFBhc3NPd25QdHI8TWVzc2FnZVBvcnRDaGFubmVsQXJyYXk+IGNoYW5uZWxzLCBXb3Jr ZXJNZXNzYWdpbmdQcm94eSogbWVzc2FnaW5nUHJveHkpCiAgICAgewotICAgICAgICByZXR1cm4g bmV3IE1lc3NhZ2VXb3JrZXJUYXNrKG1lc3NhZ2UsIGNoYW5uZWxzLCBtZXNzYWdpbmdQcm94eSk7 CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgTWVzc2FnZVdvcmtlclRhc2sobWVzc2FnZSwg Y2hhbm5lbHMsIG1lc3NhZ2luZ1Byb3h5KSk7CiAgICAgfQogCiBwcml2YXRlOgpAQCAtMTA4LDcg KzEwOCw3IEBAIGNsYXNzIFdvcmtlckV4Y2VwdGlvblRhc2sgOiBwdWJsaWMgU2NyaXB0RXhlY3V0 aW9uQ29udGV4dDo6VGFzayB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25QdHI8V29ya2Vy RXhjZXB0aW9uVGFzaz4gY3JlYXRlKGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlLCBpbnQgbGlu ZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwsIFdvcmtlck1lc3NhZ2luZ1Byb3h5KiBt ZXNzYWdpbmdQcm94eSkKICAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgV29ya2VyRXhjZXB0aW9u VGFzayhlcnJvck1lc3NhZ2UsIGxpbmVOdW1iZXIsIHNvdXJjZVVSTCwgbWVzc2FnaW5nUHJveHkp OworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IFdvcmtlckV4Y2VwdGlvblRhc2soZXJyb3JN ZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3VyY2VVUkwsIG1lc3NhZ2luZ1Byb3h5KSk7CiAgICAgfQog CiBwcml2YXRlOgpAQCAtMTQ0LDcgKzE0NCw3IEBAIGNsYXNzIFdvcmtlckNvbnRleHREZXN0cm95 ZWRUYXNrIDogcHVibGljIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2sgewogcHVibGljOgog ICAgIHN0YXRpYyBQYXNzT3duUHRyPFdvcmtlckNvbnRleHREZXN0cm95ZWRUYXNrPiBjcmVhdGUo V29ya2VyTWVzc2FnaW5nUHJveHkqIG1lc3NhZ2luZ1Byb3h5KQogICAgIHsKLSAgICAgICAgcmV0 dXJuIG5ldyBXb3JrZXJDb250ZXh0RGVzdHJveWVkVGFzayhtZXNzYWdpbmdQcm94eSk7CisgICAg ICAgIHJldHVybiBhZG9wdFB0cihuZXcgV29ya2VyQ29udGV4dERlc3Ryb3llZFRhc2sobWVzc2Fn aW5nUHJveHkpKTsKICAgICB9CiAKIHByaXZhdGU6CkBAIC0xNjUsNyArMTY1LDcgQEAgY2xhc3Mg V29ya2VyVGVybWluYXRlVGFzayA6IHB1YmxpYyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNr IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxXb3JrZXJUZXJtaW5hdGVUYXNrPiBj cmVhdGUoV29ya2VyTWVzc2FnaW5nUHJveHkqIG1lc3NhZ2luZ1Byb3h5KQogICAgIHsKLSAgICAg ICAgcmV0dXJuIG5ldyBXb3JrZXJUZXJtaW5hdGVUYXNrKG1lc3NhZ2luZ1Byb3h5KTsKKyAgICAg ICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBXb3JrZXJUZXJtaW5hdGVUYXNrKG1lc3NhZ2luZ1Byb3h5 KSk7CiAgICAgfQogCiBwcml2YXRlOgpAQCAtMTg2LDcgKzE4Niw3IEBAIGNsYXNzIFdvcmtlclRo cmVhZEFjdGl2aXR5UmVwb3J0VGFzayA6IHB1YmxpYyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpU YXNrIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxXb3JrZXJUaHJlYWRBY3Rpdml0 eVJlcG9ydFRhc2s+IGNyZWF0ZShXb3JrZXJNZXNzYWdpbmdQcm94eSogbWVzc2FnaW5nUHJveHks IGJvb2wgY29uZmlybWluZ01lc3NhZ2UsIGJvb2wgaGFzUGVuZGluZ0FjdGl2aXR5KQogICAgIHsK LSAgICAgICAgcmV0dXJuIG5ldyBXb3JrZXJUaHJlYWRBY3Rpdml0eVJlcG9ydFRhc2sobWVzc2Fn aW5nUHJveHksIGNvbmZpcm1pbmdNZXNzYWdlLCBoYXNQZW5kaW5nQWN0aXZpdHkpOworICAgICAg ICByZXR1cm4gYWRvcHRQdHIobmV3IFdvcmtlclRocmVhZEFjdGl2aXR5UmVwb3J0VGFzayhtZXNz YWdpbmdQcm94eSwgY29uZmlybWluZ01lc3NhZ2UsIGhhc1BlbmRpbmdBY3Rpdml0eSkpOwogICAg IH0KIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2Vy UnVuTG9vcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclJ1bkxvb3AuY3BwCmlu ZGV4IGFlN2IwY2JkN2U5NWZlYTRjYmU5MWU1MzBmZDk1ZjYyYjE4NDA3YTkuLjAzMWI5ZjI5MGY2 ZmU2ZjlmOTE4ZjAzZDkwNjI5YzI3ZmFiZDczYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvV29ya2VyUnVuTG9vcC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9X b3JrZXJSdW5Mb29wLmNwcApAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgV29ya2VyUnVuTG9vcDo6 cG9zdFRhc2tGb3JNb2RlKFBhc3NPd25QdHI8U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzaz4g dGFzCiAKIFBhc3NPd25QdHI8V29ya2VyUnVuTG9vcDo6VGFzaz4gV29ya2VyUnVuTG9vcDo6VGFz azo6Y3JlYXRlKFBhc3NPd25QdHI8U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzaz4gdGFzaywg Y29uc3QgU3RyaW5nJiBtb2RlKQogewotICAgIHJldHVybiBuZXcgVGFzayh0YXNrLCBtb2RlKTsK KyAgICByZXR1cm4gYWRvcHRQdHIobmV3IFRhc2sodGFzaywgbW9kZSkpOwogfQogCiB2b2lkIFdv cmtlclJ1bkxvb3A6OlRhc2s6OnBlcmZvcm1UYXNrKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNv bnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclRocmVhZC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclRocmVhZC5jcHAKaW5kZXggYWVmOTM2 ZjAxMzVmMTYxMDQ0M2I1MmY5OThjOGExN2NjYmJhMGMzNi4uNDFkNDAzYmZjNTcyMmI2MmQxZTBj NjI4ZjRjZjA0YzViMTJkM2ViOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9X b3JrZXJUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyVGhyZWFk LmNwcApAQCAtNjYsNyArNjYsNyBAQCBzdHJ1Y3QgV29ya2VyVGhyZWFkU3RhcnR1cERhdGEgewog cHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPFdvcmtlclRocmVhZFN0YXJ0dXBEYXRhPiBj cmVhdGUoY29uc3QgS1VSTCYgc2NyaXB0VVJMLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgY29u c3QgU3RyaW5nJiBzb3VyY2VDb2RlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIG5ldyBXb3JrZXJU aHJlYWRTdGFydHVwRGF0YShzY3JpcHRVUkwsIHVzZXJBZ2VudCwgc291cmNlQ29kZSk7CisgICAg ICAgIHJldHVybiBhZG9wdFB0cihuZXcgV29ya2VyVGhyZWFkU3RhcnR1cERhdGEoc2NyaXB0VVJM LCB1c2VyQWdlbnQsIHNvdXJjZUNvZGUpKTsKICAgICB9CiAKICAgICBLVVJMIG1fc2NyaXB0VVJM OwpAQCAtMTY3LDcgKzE2Nyw3IEBAIGNsYXNzIFdvcmtlclRocmVhZFNodXRkb3duRmluaXNoVGFz ayA6IHB1YmxpYyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNrIHsKIHB1YmxpYzoKICAgICBz dGF0aWMgUGFzc093blB0cjxXb3JrZXJUaHJlYWRTaHV0ZG93bkZpbmlzaFRhc2s+IGNyZWF0ZSgp CiAgICAgewotICAgICAgICByZXR1cm4gbmV3IFdvcmtlclRocmVhZFNodXRkb3duRmluaXNoVGFz aygpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IFdvcmtlclRocmVhZFNodXRkb3duRmlu aXNoVGFzaygpKTsKICAgICB9CiAKICAgICB2aXJ0dWFsIHZvaWQgcGVyZm9ybVRhc2soU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCAqY29udGV4dCkKQEAgLTE4Niw3ICsxODYsNyBAQCBjbGFzcyBXb3Jr ZXJUaHJlYWRTaHV0ZG93blN0YXJ0VGFzayA6IHB1YmxpYyBTY3JpcHRFeGVjdXRpb25Db250ZXh0 OjpUYXNrIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxXb3JrZXJUaHJlYWRTaHV0 ZG93blN0YXJ0VGFzaz4gY3JlYXRlKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgV29ya2Vy VGhyZWFkU2h1dGRvd25TdGFydFRhc2soKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBX b3JrZXJUaHJlYWRTaHV0ZG93blN0YXJ0VGFzaygpKTsKICAgICB9CiAKICAgICB2aXJ0dWFsIHZv aWQgcGVyZm9ybVRhc2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCAqY29udGV4dCkK