99932 2012-10-21 07:37:02 -0700 [EFL][WK2] Make Ewk_Favicon_Database members private 2012-10-21 09:23:33 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99696 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi rakuco tonikitoo webkit.review.bot oldest_to_newest 747086 0 cdumez 2012-10-21 07:37:02 -0700 As part of Bug 99696, make Ewk_favicon_Database members private. 747092 1 169799 cdumez 2012-10-21 07:48:28 -0700 Created attachment 169799 Patch 747111 2 169799 webkit.review.bot 2012-10-21 09:23:29 -0700 Comment on attachment 169799 Patch Clearing flags on attachment: 169799 Committed r132004: <http://trac.webkit.org/changeset/132004> 747112 3 webkit.review.bot 2012-10-21 09:23:33 -0700 All reviewed patches have been landed. Closing bug. 169799 2012-10-21 07:48:28 -0700 2012-10-21 09:23:28 -0700 Patch 99932_faviconDatabase_cpp.patch text/plain 16996 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3M2NjMmNlLi40N2YxMzM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzcg QEAKIDIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrX0Zhdmljb25fRGF0YWJhc2UgbWVt YmVycyBwcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05OTkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgRXdrX0Zhdmljb25fRGF0YWJhc2UgY2xhc3MgbWVtYmVycyBwcml2YXRlLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJhc2UuY3BwOgorICAg ICAgICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6OkV3a19GYXZpY29uX0RhdGFiYXNlKToKKyAgICAg ICAgKEV3a19GYXZpY29uX0RhdGFiYXNlOjppY29uVVJMRm9yUGFnZVVSTCk6CisgICAgICAgIChF d2tfRmF2aWNvbl9EYXRhYmFzZTo6d2F0Y2hDaGFuZ2VzKToKKyAgICAgICAgKEV3a19GYXZpY29u X0RhdGFiYXNlOjp1bndhdGNoQ2hhbmdlcyk6CisgICAgICAgIChBc3luY0ljb25SZXF1ZXN0UmVz cG9uc2UpOgorICAgICAgICAoQXN5bmNJY29uUmVxdWVzdFJlc3BvbnNlOjpBc3luY0ljb25SZXF1 ZXN0UmVzcG9uc2UpOgorICAgICAgICAocmVzcG9uZF9pY29uX3JlcXVlc3RfaWRsZSk6CisgICAg ICAgIChFd2tfRmF2aWNvbl9EYXRhYmFzZTo6aWNvbkZvclBhZ2VVUkwpOgorICAgICAgICAoRXdr X0Zhdmljb25fRGF0YWJhc2U6OmRpZENoYW5nZUljb25Gb3JQYWdlVVJMKToKKyAgICAgICAgKEV3 a19GYXZpY29uX0RhdGFiYXNlOjpnZXRJY29uU3VyZmFjZVN5bmNocm9ub3VzbHkpOgorICAgICAg ICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6Omljb25EYXRhUmVhZHlGb3JQYWdlVVJMKToKKyAgICAg ICAgKGV3a19mYXZpY29uX2RhdGFiYXNlX2ljb25fdXJsX2dldCk6CisgICAgICAgIChld2tfZmF2 aWNvbl9kYXRhYmFzZV9hc3luY19pY29uX2dldCk6CisgICAgICAgIChld2tfZmF2aWNvbl9kYXRh YmFzZV9pY29uX2NoYW5nZV9jYWxsYmFja19hZGQpOgorICAgICAgICAoZXdrX2Zhdmljb25fZGF0 YWJhc2VfaWNvbl9jaGFuZ2VfY2FsbGJhY2tfZGVsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L2V3a19mYXZpY29uX2RhdGFiYXNlX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a19GYXZpY29uX0Rh dGFiYXNlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAg ICAgIChFd2tfVmlld19Qcml2YXRlX0RhdGE6On5Fd2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAg ICAgICAoX2V3a192aWV3X2luaXRpYWxpemUpOgorCisyMDEyLTEwLTIxICBDaHJpc3RvcGhlIER1 bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKICAgICAgICAgW0VGTF1bV0syXSBN YWtlIEV3ayBpbnRlbnQgY2xhc3NlcyBtZW1iZXJzIHByaXZhdGUKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5ODMyCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcApp bmRleCA5ZTA1OWUyLi4xN2M5OWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJhc2UuY3BwCkBAIC0zOCwxMSArMzgs OCBAQAogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCi1zdGF0aWMgdm9pZCBkaWRDaGFuZ2VJ Y29uRm9yUGFnZVVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2UsIFdLVVJMUmVmIHBh Z2VVUkwsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotc3RhdGljIHZvaWQgaWNvbkRhdGFSZWFk eUZvclBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlLCBXS1VSTFJlZiBwYWdl VVJMLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLQogRXdrX0Zhdmljb25fRGF0YWJhc2U6OkV3 a19GYXZpY29uX0RhdGFiYXNlKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZVJlZikKLSAg ICA6ICB3a0ljb25EYXRhYmFzZShpY29uRGF0YWJhc2VSZWYpCisgICAgOiAgbV93a0ljb25EYXRh YmFzZShpY29uRGF0YWJhc2VSZWYpCiB7CiAgICAgV0tJY29uRGF0YWJhc2VDbGllbnQgaWNvbkRh dGFiYXNlQ2xpZW50OwogICAgIG1lbXNldCgmaWNvbkRhdGFiYXNlQ2xpZW50LCAwLCBzaXplb2Yo V0tJY29uRGF0YWJhc2VDbGllbnQpKTsKQEAgLTUwLDI2ICs0NywxMDAgQEAgRXdrX0Zhdmljb25f RGF0YWJhc2U6OkV3a19GYXZpY29uX0RhdGFiYXNlKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRh YmFzZVJlZikKICAgICBpY29uRGF0YWJhc2VDbGllbnQuY2xpZW50SW5mbyA9IHRoaXM7CiAgICAg aWNvbkRhdGFiYXNlQ2xpZW50LmRpZENoYW5nZUljb25Gb3JQYWdlVVJMID0gZGlkQ2hhbmdlSWNv bkZvclBhZ2VVUkw7CiAgICAgaWNvbkRhdGFiYXNlQ2xpZW50Lmljb25EYXRhUmVhZHlGb3JQYWdl VVJMID0gaWNvbkRhdGFSZWFkeUZvclBhZ2VVUkw7Ci0gICAgV0tJY29uRGF0YWJhc2VTZXRJY29u RGF0YWJhc2VDbGllbnQod2tJY29uRGF0YWJhc2UuZ2V0KCksICZpY29uRGF0YWJhc2VDbGllbnQp OworICAgIFdLSWNvbkRhdGFiYXNlU2V0SWNvbkRhdGFiYXNlQ2xpZW50KG1fd2tJY29uRGF0YWJh c2UuZ2V0KCksICZpY29uRGF0YWJhc2VDbGllbnQpOworfQorCitTdHJpbmcgRXdrX0Zhdmljb25f RGF0YWJhc2U6Omljb25VUkxGb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYgcGFnZVVSTCkgY29uc3QK K3sKKyAgICBTdHJpbmcgaWNvblVSTDsKKyAgICB0b0ltcGwobV93a0ljb25EYXRhYmFzZS5nZXQo KSktPnN5bmNocm9ub3VzSWNvblVSTEZvclBhZ2VVUkwocGFnZVVSTCwgaWNvblVSTCk7CisKKyAg ICByZXR1cm4gaWNvblVSTDsKK30KKwordm9pZCBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6d2F0Y2hD aGFuZ2VzKGNvbnN0IEljb25DaGFuZ2VDYWxsYmFja0RhdGEmIGNhbGxiYWNrRGF0YSkKK3sKKyAg ICBBU1NFUlQoY2FsbGJhY2tEYXRhLmNhbGxiYWNrKTsKKyAgICBpZiAobV9jaGFuZ2VMaXN0ZW5l cnMuY29udGFpbnMoY2FsbGJhY2tEYXRhLmNhbGxiYWNrKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgbV9jaGFuZ2VMaXN0ZW5lcnMuYWRkKGNhbGxiYWNrRGF0YS5jYWxsYmFjaywgY2FsbGJhY2tE YXRhKTsKK30KKwordm9pZCBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6dW53YXRjaENoYW5nZXMoRXdr X0Zhdmljb25fRGF0YWJhc2VfSWNvbl9DaGFuZ2VfQ2IgY2FsbGJhY2spCit7CisgICAgQVNTRVJU KGNhbGxiYWNrKTsKKyAgICBtX2NoYW5nZUxpc3RlbmVycy5yZW1vdmUoY2FsbGJhY2spOworfQor CitzdHJ1Y3QgQXN5bmNJY29uUmVxdWVzdFJlc3BvbnNlIHsKKyAgICBTdHJpbmcgcGFnZVVSTDsK KyAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBzdXJmYWNlOworICAgIEljb25SZXF1ZXN0Q2Fs bGJhY2tEYXRhIGNhbGxiYWNrRGF0YTsKKworICAgIEFzeW5jSWNvblJlcXVlc3RSZXNwb25zZShj b25zdCBTdHJpbmcmIHBhZ2VVUkwsIFBhc3NSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBzdXJmYWNl LCBjb25zdCBJY29uUmVxdWVzdENhbGxiYWNrRGF0YSYgY2FsbGJhY2tEYXRhKQorICAgICAgICA6 IHBhZ2VVUkwocGFnZVVSTCkKKyAgICAgICAgLCBzdXJmYWNlKHN1cmZhY2UpCisgICAgICAgICwg Y2FsbGJhY2tEYXRhKGNhbGxiYWNrRGF0YSkKKyAgICB7IH0KK307CisKK3N0YXRpYyBFaW5hX0Jv b2wgcmVzcG9uZF9pY29uX3JlcXVlc3RfaWRsZSh2b2lkKiBkYXRhKQoreworICAgIEFzeW5jSWNv blJlcXVlc3RSZXNwb25zZSogcmVzcG9uc2UgPSBzdGF0aWNfY2FzdDxBc3luY0ljb25SZXF1ZXN0 UmVzcG9uc2UqPihkYXRhKTsKKworICAgIFJlZlB0cjxFdmFzX09iamVjdD4gaWNvbiA9IHJlc3Bv bnNlLT5zdXJmYWNlID8gV2ViQ29yZTo6ZXZhc09iamVjdEZyb21DYWlyb0ltYWdlU3VyZmFjZShy ZXNwb25zZS0+Y2FsbGJhY2tEYXRhLmV2YXMsIHJlc3BvbnNlLT5zdXJmYWNlLmdldCgpKSA6IDA7 CisgICAgcmVzcG9uc2UtPmNhbGxiYWNrRGF0YS5jYWxsYmFjayhyZXNwb25zZS0+cGFnZVVSTC51 dGY4KCkuZGF0YSgpLCBpY29uLmdldCgpLCByZXNwb25zZS0+Y2FsbGJhY2tEYXRhLnVzZXJEYXRh KTsKKworICAgIGRlbGV0ZSByZXNwb25zZTsKKworICAgIHJldHVybiBFQ09SRV9DQUxMQkFDS19E T05FOwogfQogCi1zdGF0aWMgdm9pZCBkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTChXS0ljb25EYXRh YmFzZVJlZiwgV0tVUkxSZWYgcGFnZVVSTFJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3Zv aWQgRXdrX0Zhdmljb25fRGF0YWJhc2U6Omljb25Gb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYgcGFn ZVVSTCwgY29uc3QgSWNvblJlcXVlc3RDYWxsYmFja0RhdGEmIGNhbGxiYWNrRGF0YSkKK3sKKyAg ICBXZWJJY29uRGF0YWJhc2UqIHdlYkljb25EYXRhYmFzZSA9IHRvSW1wbChtX3drSWNvbkRhdGFi YXNlLmdldCgpKTsKKworICAgIC8vIFdlIGFzayBmb3IgdGhlIGljb24gZGlyZWN0bHkuIElmIHdl IGRvbid0IGdldCB0aGUgaWNvbiBkYXRhIG5vdywKKyAgICAvLyB3ZSdsbCBiZSBub3RpZmllZCBs YXRlciAoZXZlbiBpZiB0aGUgZGF0YWJhc2UgaXMgc3RpbGwgaW1wb3J0aW5nIGljb25zKS4KKyAg ICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBzdXJmYWNlID0gZ2V0SWNvblN1cmZhY2VTeW5jaHJv bm91c2x5KHBhZ2VVUkwpOworCisgICAgLy8gSWYgdGhlcmUncyBubyB2YWxpZCBpY29uLCBidXQg dGhlcmUncyBhbiBpY29uVVJMIHJlZ2lzdGVyZWQsCisgICAgLy8gb3IgaXQncyBzdGlsbCBub3Qg cmVnaXN0ZXJlZCBidXQgdGhlIGltcG9ydCBwcm9jZXNzIGhhc24ndAorICAgIC8vIGZpbmlzaGVk IHlldCwgd2UgbmVlZCB0byB3YWl0IGZvciBpY29uRGF0YVJlYWR5Rm9yUGFnZVVSTCB0byBiZQor ICAgIC8vIGNhbGxlZCBiZWZvcmUgbWFraW5nIGFuZCBpbmZvcm1lZCBkZWNpc2lvbi4KKyAgICBT dHJpbmcgaWNvblVSTCA9IGljb25VUkxGb3JQYWdlVVJMKHBhZ2VVUkwpOworICAgIGlmICghc3Vy ZmFjZSAmJiAoIWljb25VUkwuaXNFbXB0eSgpIHx8ICF3ZWJJY29uRGF0YWJhc2UtPmlzVXJsSW1w b3J0Q29tcGxldGVkKCkpKSB7CisgICAgICAgIFBlbmRpbmdJY29uUmVxdWVzdFZlY3RvciByZXF1 ZXN0cyA9IG1faWNvblJlcXVlc3RzLmdldChwYWdlVVJMKTsKKyAgICAgICAgcmVxdWVzdHMuYXBw ZW5kKGNhbGxiYWNrRGF0YSk7CisgICAgICAgIG1faWNvblJlcXVlc3RzLnNldChwYWdlVVJMLCBy ZXF1ZXN0cyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICAvLyBSZXNwb25kIHdoZW4g aWRsZS4KKyAgICBBc3luY0ljb25SZXF1ZXN0UmVzcG9uc2UqIHJlc3BvbnNlID0gbmV3IEFzeW5j SWNvblJlcXVlc3RSZXNwb25zZShwYWdlVVJMLCBzdXJmYWNlLnJlbGVhc2UoKSwgY2FsbGJhY2tE YXRhKTsKKyAgICBlY29yZV9pZGxlcl9hZGQocmVzcG9uZF9pY29uX3JlcXVlc3RfaWRsZSwgcmVz cG9uc2UpOworfQorCit2b2lkIEV3a19GYXZpY29uX0RhdGFiYXNlOjpkaWRDaGFuZ2VJY29uRm9y UGFnZVVSTChXS0ljb25EYXRhYmFzZVJlZiwgV0tVUkxSZWYgcGFnZVVSTFJlZiwgY29uc3Qgdm9p ZCogY2xpZW50SW5mbykKIHsKICAgICBjb25zdCBFd2tfRmF2aWNvbl9EYXRhYmFzZSogZXdrSWNv bkRhdGFiYXNlID0gc3RhdGljX2Nhc3Q8Y29uc3QgRXdrX0Zhdmljb25fRGF0YWJhc2UqPihjbGll bnRJbmZvKTsKIAotICAgIGlmIChld2tJY29uRGF0YWJhc2UtPmNoYW5nZUxpc3RlbmVycy5pc0Vt cHR5KCkpCisgICAgaWYgKGV3a0ljb25EYXRhYmFzZS0+bV9jaGFuZ2VMaXN0ZW5lcnMuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBDU3RyaW5nIHBhZ2VVUkwgPSB0b0ltcGwocGFn ZVVSTFJlZiktPnN0cmluZygpLnV0ZjgoKTsKIAotICAgIENoYW5nZUxpc3RlbmVyTWFwOjpjb25z dF9pdGVyYXRvciBpdCA9IGV3a0ljb25EYXRhYmFzZS0+Y2hhbmdlTGlzdGVuZXJzLmJlZ2luKCk7 Ci0gICAgQ2hhbmdlTGlzdGVuZXJNYXA6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IGV3a0ljb25EYXRh YmFzZS0+Y2hhbmdlTGlzdGVuZXJzLmVuZCgpOworICAgIENoYW5nZUxpc3RlbmVyTWFwOjpjb25z dF9pdGVyYXRvciBpdCA9IGV3a0ljb25EYXRhYmFzZS0+bV9jaGFuZ2VMaXN0ZW5lcnMuYmVnaW4o KTsKKyAgICBDaGFuZ2VMaXN0ZW5lck1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gZXdrSWNvbkRh dGFiYXNlLT5tX2NoYW5nZUxpc3RlbmVycy5lbmQoKTsKICAgICBmb3IgKDsgaXQgIT0gZW5kOyAr K2l0KQogICAgICAgICBpdC0+dmFsdWUuY2FsbGJhY2socGFnZVVSTC5kYXRhKCksIGl0LT52YWx1 ZS51c2VyRGF0YSk7CiB9CiAKLXN0YXRpYyBjYWlyb19zdXJmYWNlX3QqIGdldEljb25TdXJmYWNl U3luY2hyb25vdXNseShXZWJJY29uRGF0YWJhc2UqIHdlYkljb25EYXRhYmFzZSwgY29uc3QgU3Ry aW5nJiBwYWdlVVJMKQorUGFzc1JlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IEV3a19GYXZpY29uX0Rh dGFiYXNlOjpnZXRJY29uU3VyZmFjZVN5bmNocm9ub3VzbHkoY29uc3QgU3RyaW5nJiBwYWdlVVJM KSBjb25zdAogeworICAgIFdlYkljb25EYXRhYmFzZSogd2ViSWNvbkRhdGFiYXNlID0gdG9JbXBs KG1fd2tJY29uRGF0YWJhc2UuZ2V0KCkpOworCiAgICAgd2ViSWNvbkRhdGFiYXNlLT5yZXRhaW5J Y29uRm9yUGFnZVVSTChwYWdlVVJMKTsKIAogICAgIFdlYkNvcmU6Ok5hdGl2ZUltYWdlUHRyIGlj b24gPSB3ZWJJY29uRGF0YWJhc2UtPm5hdGl2ZUltYWdlRm9yUGFnZVVSTChwYWdlVVJMKTsKQEAg LTc4LDIxICsxNDksMjIgQEAgc3RhdGljIGNhaXJvX3N1cmZhY2VfdCogZ2V0SWNvblN1cmZhY2VT eW5jaHJvbm91c2x5KFdlYkljb25EYXRhYmFzZSogd2ViSWNvbkRhdGEKICAgICAgICAgcmV0dXJu IDA7CiAgICAgfQogCi0gICAgcmV0dXJuIGljb24tPnN1cmZhY2UoKTsKKyAgICBSZWZQdHI8Y2Fp cm9fc3VyZmFjZV90PiBzdXJmYWNlID0gaWNvbi0+c3VyZmFjZSgpOworCisgICAgcmV0dXJuIHN1 cmZhY2UucmVsZWFzZSgpOwogfQogCi1zdGF0aWMgdm9pZCBpY29uRGF0YVJlYWR5Rm9yUGFnZVVS TChXS0ljb25EYXRhYmFzZVJlZiwgV0tVUkxSZWYgcGFnZVVSTCwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKK3ZvaWQgRXdrX0Zhdmljb25fRGF0YWJhc2U6Omljb25EYXRhUmVhZHlGb3JQYWdlVVJM KFdLSWNvbkRhdGFiYXNlUmVmLCBXS1VSTFJlZiBwYWdlVVJMLCBjb25zdCB2b2lkKiBjbGllbnRJ bmZvKQogewogICAgIEV3a19GYXZpY29uX0RhdGFiYXNlKiBld2tJY29uRGF0YWJhc2UgPSBjb25z dF9jYXN0PEV3a19GYXZpY29uX0RhdGFiYXNlKj4oc3RhdGljX2Nhc3Q8Y29uc3QgRXdrX0Zhdmlj b25fRGF0YWJhc2UqPihjbGllbnRJbmZvKSk7CiAKICAgICBTdHJpbmcgdXJsU3RyaW5nID0gdG9J bXBsKHBhZ2VVUkwpLT5zdHJpbmcoKTsKLSAgICBpZiAoIWV3a0ljb25EYXRhYmFzZS0+aWNvblJl cXVlc3RzLmNvbnRhaW5zKHVybFN0cmluZykpCisgICAgaWYgKCFld2tJY29uRGF0YWJhc2UtPm1f aWNvblJlcXVlc3RzLmNvbnRhaW5zKHVybFN0cmluZykpCiAgICAgICAgIHJldHVybjsKIAotICAg IFdlYkljb25EYXRhYmFzZSogd2ViSWNvbkRhdGFiYXNlID0gdG9JbXBsKGV3a0ljb25EYXRhYmFz ZS0+d2tJY29uRGF0YWJhc2UuZ2V0KCkpOwotICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IHN1 cmZhY2UgPSBnZXRJY29uU3VyZmFjZVN5bmNocm9ub3VzbHkod2ViSWNvbkRhdGFiYXNlLCB1cmxT dHJpbmcpOworICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IHN1cmZhY2UgPSBld2tJY29uRGF0 YWJhc2UtPmdldEljb25TdXJmYWNlU3luY2hyb25vdXNseSh1cmxTdHJpbmcpOwogCi0gICAgUGVu ZGluZ0ljb25SZXF1ZXN0VmVjdG9yIHJlcXVlc3RzRm9yVVJMID0gZXdrSWNvbkRhdGFiYXNlLT5p Y29uUmVxdWVzdHMudGFrZSh1cmxTdHJpbmcpOworICAgIFBlbmRpbmdJY29uUmVxdWVzdFZlY3Rv ciByZXF1ZXN0c0ZvclVSTCA9IGV3a0ljb25EYXRhYmFzZS0+bV9pY29uUmVxdWVzdHMudGFrZSh1 cmxTdHJpbmcpOwogICAgIHNpemVfdCByZXF1ZXN0Q291bnQgPSByZXF1ZXN0c0ZvclVSTC5zaXpl KCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCByZXF1ZXN0Q291bnQ7ICsraSkgewogICAg ICAgICBjb25zdCBJY29uUmVxdWVzdENhbGxiYWNrRGF0YSYgY2FsbGJhY2tEYXRhID0gcmVxdWVz dHNGb3JVUkxbaV07CkBAIC0xMDYsMzYgKzE3OCwxMSBAQCBjb25zdCBjaGFyKiBld2tfZmF2aWNv bl9kYXRhYmFzZV9pY29uX3VybF9nZXQoRXdrX0Zhdmljb25fRGF0YWJhc2UqIGV3a0ljb25EYXRh YgogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tJY29uRGF0YWJhc2UsIDAp OwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChwYWdlVVJMLCAwKTsKIAotICAg IFN0cmluZyBpY29uVVJMOwotICAgIHRvSW1wbChld2tJY29uRGF0YWJhc2UtPndrSWNvbkRhdGFi YXNlLmdldCgpKS0+c3luY2hyb25vdXNJY29uVVJMRm9yUGFnZVVSTChwYWdlVVJMLCBpY29uVVJM KTsKKyAgICBTdHJpbmcgaWNvblVSTCA9IGV3a0ljb25EYXRhYmFzZS0+aWNvblVSTEZvclBhZ2VV UkwoU3RyaW5nOjpmcm9tVVRGOChwYWdlVVJMKSk7CiAKICAgICByZXR1cm4gZWluYV9zdHJpbmdz aGFyZV9hZGQoaWNvblVSTC51dGY4KCkuZGF0YSgpKTsKIH0KIAotc3RydWN0IEFzeW5jSWNvblJl cXVlc3RSZXNwb25zZSB7Ci0gICAgU3RyaW5nIHBhZ2VVUkw7Ci0gICAgUmVmUHRyPGNhaXJvX3N1 cmZhY2VfdD4gc3VyZmFjZTsKLSAgICBJY29uUmVxdWVzdENhbGxiYWNrRGF0YSBjYWxsYmFja0Rh dGE7Ci0KLSAgICBBc3luY0ljb25SZXF1ZXN0UmVzcG9uc2UoY29uc3QgU3RyaW5nJiBfcGFnZVVS TCwgUGFzc1JlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IF9zdXJmYWNlLCBjb25zdCBJY29uUmVxdWVz dENhbGxiYWNrRGF0YSYgX2NhbGxiYWNrRGF0YSkKLSAgICAgICAgOiBwYWdlVVJMKF9wYWdlVVJM KQotICAgICAgICAsIHN1cmZhY2UoX3N1cmZhY2UpCi0gICAgICAgICwgY2FsbGJhY2tEYXRhKF9j YWxsYmFja0RhdGEpCi0gICAgeyB9Ci19OwotCi1zdGF0aWMgRWluYV9Cb29sIHJlc3BvbmRfaWNv bl9yZXF1ZXN0X2lkbGUodm9pZCogZGF0YSkKLXsKLSAgICBBc3luY0ljb25SZXF1ZXN0UmVzcG9u c2UqIHJlc3BvbnNlID0gc3RhdGljX2Nhc3Q8QXN5bmNJY29uUmVxdWVzdFJlc3BvbnNlKj4oZGF0 YSk7Ci0KLSAgICBSZWZQdHI8RXZhc19PYmplY3Q+IGljb24gPSByZXNwb25zZS0+c3VyZmFjZSA/ IFdlYkNvcmU6OmV2YXNPYmplY3RGcm9tQ2Fpcm9JbWFnZVN1cmZhY2UocmVzcG9uc2UtPmNhbGxi YWNrRGF0YS5ldmFzLCByZXNwb25zZS0+c3VyZmFjZS5nZXQoKSkgOiAwOwotICAgIHJlc3BvbnNl LT5jYWxsYmFja0RhdGEuY2FsbGJhY2socmVzcG9uc2UtPnBhZ2VVUkwudXRmOCgpLmRhdGEoKSwg aWNvbi5nZXQoKSwgcmVzcG9uc2UtPmNhbGxiYWNrRGF0YS51c2VyRGF0YSk7Ci0KLSAgICBkZWxl dGUgcmVzcG9uc2U7Ci0KLSAgICByZXR1cm4gRUNPUkVfQ0FMTEJBQ0tfRE9ORTsKLX0KLQogRWlu YV9Cb29sIGV3a19mYXZpY29uX2RhdGFiYXNlX2FzeW5jX2ljb25fZ2V0KEV3a19GYXZpY29uX0Rh dGFiYXNlKiBld2tJY29uRGF0YWJhc2UsIGNvbnN0IGNoYXIqIHBhZ2VfdXJsLCBFdmFzKiBldmFz LCBFd2tfRmF2aWNvbl9EYXRhYmFzZV9Bc3luY19JY29uX0dldF9DYiBjYWxsYmFjaywgdm9pZCog dXNlckRhdGEpCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGV3a0ljb25E YXRhYmFzZSwgZmFsc2UpOwpAQCAtMTQzLDI4ICsxOTAsNyBAQCBFaW5hX0Jvb2wgZXdrX2Zhdmlj b25fZGF0YWJhc2VfYXN5bmNfaWNvbl9nZXQoRXdrX0Zhdmljb25fRGF0YWJhc2UqIGV3a0ljb25E YXRhYgogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChldmFzLCBmYWxzZSk7CiAg ICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGNhbGxiYWNrLCBmYWxzZSk7CiAKLSAg ICBXZWJJY29uRGF0YWJhc2UqIHdlYkljb25EYXRhYmFzZSA9IHRvSW1wbChld2tJY29uRGF0YWJh c2UtPndrSWNvbkRhdGFiYXNlLmdldCgpKTsKLQotICAgIC8vIFdlIGFzayBmb3IgdGhlIGljb24g ZGlyZWN0bHkuIElmIHdlIGRvbid0IGdldCB0aGUgaWNvbiBkYXRhIG5vdywKLSAgICAvLyB3ZSds bCBiZSBub3RpZmllZCBsYXRlciAoZXZlbiBpZiB0aGUgZGF0YWJhc2UgaXMgc3RpbGwgaW1wb3J0 aW5nIGljb25zKS4KLSAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBzdXJmYWNlID0gZ2V0SWNv blN1cmZhY2VTeW5jaHJvbm91c2x5KHdlYkljb25EYXRhYmFzZSwgcGFnZV91cmwpOwotCi0gICAg Ly8gSWYgdGhlcmUncyBubyB2YWxpZCBpY29uLCBidXQgdGhlcmUncyBhbiBpY29uVVJMIHJlZ2lz dGVyZWQsCi0gICAgLy8gb3IgaXQncyBzdGlsbCBub3QgcmVnaXN0ZXJlZCBidXQgdGhlIGltcG9y dCBwcm9jZXNzIGhhc24ndAotICAgIC8vIGZpbmlzaGVkIHlldCwgd2UgbmVlZCB0byB3YWl0IGZv ciBpY29uRGF0YVJlYWR5Rm9yUGFnZVVSTCB0byBiZQotICAgIC8vIGNhbGxlZCBiZWZvcmUgbWFr aW5nIGFuZCBpbmZvcm1lZCBkZWNpc2lvbi4KLSAgICBTdHJpbmcgaWNvblVSTEZvclBhZ2VVUkw7 Ci0gICAgd2ViSWNvbkRhdGFiYXNlLT5zeW5jaHJvbm91c0ljb25VUkxGb3JQYWdlVVJMKHBhZ2Vf dXJsLCBpY29uVVJMRm9yUGFnZVVSTCk7Ci0gICAgaWYgKCFzdXJmYWNlICYmICghaWNvblVSTEZv clBhZ2VVUkwuaXNFbXB0eSgpIHx8ICF3ZWJJY29uRGF0YWJhc2UtPmlzVXJsSW1wb3J0Q29tcGxl dGVkKCkpKSB7Ci0gICAgICAgIFBlbmRpbmdJY29uUmVxdWVzdFZlY3RvciByZXF1ZXN0cyA9IGV3 a0ljb25EYXRhYmFzZS0+aWNvblJlcXVlc3RzLmdldChwYWdlX3VybCk7Ci0gICAgICAgIHJlcXVl c3RzLmFwcGVuZChJY29uUmVxdWVzdENhbGxiYWNrRGF0YShjYWxsYmFjaywgdXNlckRhdGEsIGV2 YXMpKTsKLSAgICAgICAgZXdrSWNvbkRhdGFiYXNlLT5pY29uUmVxdWVzdHMuc2V0KHBhZ2VfdXJs LCByZXF1ZXN0cyk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQotICAgIC8vIFJlc3Bv bmQgd2hlbiBpZGxlLgotICAgIEFzeW5jSWNvblJlcXVlc3RSZXNwb25zZSogcmVzcG9uc2UgPSBu ZXcgQXN5bmNJY29uUmVxdWVzdFJlc3BvbnNlKHBhZ2VfdXJsLCBzdXJmYWNlLnJlbGVhc2UoKSwg SWNvblJlcXVlc3RDYWxsYmFja0RhdGEoY2FsbGJhY2ssIHVzZXJEYXRhLCBldmFzKSk7Ci0gICAg ZWNvcmVfaWRsZXJfYWRkKHJlc3BvbmRfaWNvbl9yZXF1ZXN0X2lkbGUsIHJlc3BvbnNlKTsKKyAg ICBld2tJY29uRGF0YWJhc2UtPmljb25Gb3JQYWdlVVJMKFN0cmluZzo6ZnJvbVVURjgocGFnZV91 cmwpLCBJY29uUmVxdWVzdENhbGxiYWNrRGF0YShjYWxsYmFjaywgdXNlckRhdGEsIGV2YXMpKTsK IAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMTc0LDEwICsyMDAsNyBAQCB2b2lkIGV3a19mYXZp Y29uX2RhdGFiYXNlX2ljb25fY2hhbmdlX2NhbGxiYWNrX2FkZChFd2tfRmF2aWNvbl9EYXRhYmFz ZSogZXdrSWNvbgogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGV3a0ljb25EYXRhYmFz ZSk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oY2FsbGJhY2spOwogCi0gICAgaWYg KGV3a0ljb25EYXRhYmFzZS0+Y2hhbmdlTGlzdGVuZXJzLmNvbnRhaW5zKGNhbGxiYWNrKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgZXdrSWNvbkRhdGFiYXNlLT5jaGFuZ2VMaXN0ZW5lcnMuYWRk KGNhbGxiYWNrLCBJY29uQ2hhbmdlQ2FsbGJhY2tEYXRhKGNhbGxiYWNrLCB1c2VyRGF0YSkpOwor ICAgIGV3a0ljb25EYXRhYmFzZS0+d2F0Y2hDaGFuZ2VzKEljb25DaGFuZ2VDYWxsYmFja0RhdGEo Y2FsbGJhY2ssIHVzZXJEYXRhKSk7CiB9CiAKIHZvaWQgZXdrX2Zhdmljb25fZGF0YWJhc2VfaWNv bl9jaGFuZ2VfY2FsbGJhY2tfZGVsKEV3a19GYXZpY29uX0RhdGFiYXNlKiBld2tJY29uRGF0YWJh c2UsIEV3a19GYXZpY29uX0RhdGFiYXNlX0ljb25fQ2hhbmdlX0NiIGNhbGxiYWNrKQpAQCAtMTg1 LDUgKzIwOCw1IEBAIHZvaWQgZXdrX2Zhdmljb25fZGF0YWJhc2VfaWNvbl9jaGFuZ2VfY2FsbGJh Y2tfZGVsKEV3a19GYXZpY29uX0RhdGFiYXNlKiBld2tJY29uCiAgICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk4oZXdrSWNvbkRhdGFiYXNlKTsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTihjYWxsYmFjayk7CiAKLSAgICBld2tJY29uRGF0YWJhc2UtPmNoYW5nZUxpc3RlbmVycy5y ZW1vdmUoY2FsbGJhY2spOworICAgIGV3a0ljb25EYXRhYmFzZS0+dW53YXRjaENoYW5nZXMoY2Fs bGJhY2spOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Zhdmljb25fZGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19mYXZpY29uX2RhdGFiYXNlLmgKaW5kZXggOGNlYWY1Yi4uODljYzMxZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJhc2Uu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRh YmFzZS5oCkBAIC02MywxMSArNjMsOSBAQCB0eXBlZGVmIHZvaWQgKCpFd2tfRmF2aWNvbl9EYXRh YmFzZV9Bc3luY19JY29uX0dldF9DYikoY29uc3QgY2hhciAqcGFnZV91cmwsIEV2YQogICogQHBh cmFtIGRhdGFiYXNlIGRhdGFiYXNlIG9iamVjdCB0byBxdWVyeQogICogQHBhcmFtIHBhZ2VfdXJs IFVSTCBvZiB0aGUgcGFnZSB0byBnZXQgdGhlIGZhdmljb24gVVJMIGZvcgogICoKLSAqIEByZXR1 cm4gdGhlIGZhdmljb24gVVJMIHBvaW50ZXIsIHRoYXQgbWF5IGJlIEBjIE5VTEwuIFRoaXMgcG9p bnRlciBpcwotICogICAgICAgICBndWFyYW50ZWVkIHRvIGJlIGVpbmFfc3RyaW5nc2hhcmUsIHNv IHdoZW5ldmVyIHBvc3NpYmxlCi0gKiAgICAgICAgIHNhdmUgeW91cnNlbGYgc29tZSBjcHUgY3lj bGVzIGFuZCB1c2UKLSAqICAgICAgICAgZWluYV9zdHJpbmdzaGFyZV9yZWYoKSBpbnN0ZWFkIG9m IGVpbmFfc3RyaW5nc2hhcmVfYWRkKCkgb3IKLSAqICAgICAgICAgc3RyZHVwKCkKKyAqIEByZXR1 cm4gYSBuZXdseSBhbGxvY2F0ZWQgc3RyaW5nIGd1YXJhbnRlZWQgdG8gYmUgZWluYV9zdHJpbmdz aGFyZQorICogICAgICAgICBvciBAYyBOVUxMIGluIGNhc2Ugb2YgZXJyb3Igb3IgaWYgdGhlIGtl eSBkb2VzIG5vdCBleGlzdC4KKyAqICAgICAgICAgWW91IG5lZWQgdG8gY2FsbCBlaW5hX3N0cmlu Z3NoYXJlX2RlbCgpIGFmdGVyIHVzZS4KICAqLwogRUFQSSBjb25zdCBjaGFyICpld2tfZmF2aWNv bl9kYXRhYmFzZV9pY29uX3VybF9nZXQoRXdrX0Zhdmljb25fRGF0YWJhc2UgKmRhdGFiYXNlLCBj b25zdCBjaGFyICpwYWdlX3VybCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlX3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlX3ByaXZhdGUuaAppbmRl eCA5ZDkwOTAyLi5iOGJhNGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZV9wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJhc2VfcHJpdmF0ZS5oCkBAIC03 MSwxNyArNzEsMjggQEAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZyAvKiBwYWdlVVJMICovLCBQZW5k aW5nSWNvblJlcXVlc3RWZWN0b3I+IFBlbmRpbmdJY29uUmVxdWUKIAogY2xhc3MgRXdrX0Zhdmlj b25fRGF0YWJhc2UgewogcHVibGljOgotICAgIFdLUmV0YWluUHRyPFdLSWNvbkRhdGFiYXNlUmVm PiB3a0ljb25EYXRhYmFzZTsKLSAgICBDaGFuZ2VMaXN0ZW5lck1hcCBjaGFuZ2VMaXN0ZW5lcnM7 Ci0gICAgUGVuZGluZ0ljb25SZXF1ZXN0TWFwIGljb25SZXF1ZXN0czsKLQogICAgIHN0YXRpYyBQ YXNzT3duUHRyPEV3a19GYXZpY29uX0RhdGFiYXNlPiBjcmVhdGUoV0tJY29uRGF0YWJhc2VSZWYg aWNvbkRhdGFiYXNlUmVmKQogICAgIHsKICAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tf RmF2aWNvbl9EYXRhYmFzZShpY29uRGF0YWJhc2VSZWYpKTsKICAgICB9CiAKKyAgICBTdHJpbmcg aWNvblVSTEZvclBhZ2VVUkwoY29uc3QgU3RyaW5nJiBwYWdlVVJMKSBjb25zdDsKKyAgICB2b2lk IGljb25Gb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYgcGFnZVVSTCwgY29uc3QgSWNvblJlcXVlc3RD YWxsYmFja0RhdGEmIGNhbGxiYWNrRGF0YSk7CisKKyAgICB2b2lkIHdhdGNoQ2hhbmdlcyhjb25z dCBJY29uQ2hhbmdlQ2FsbGJhY2tEYXRhJiBjYWxsYmFja0RhdGEpOworICAgIHZvaWQgdW53YXRj aENoYW5nZXMoRXdrX0Zhdmljb25fRGF0YWJhc2VfSWNvbl9DaGFuZ2VfQ2IgY2FsbGJhY2spOwor CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IEV3a19GYXZpY29uX0RhdGFiYXNlKFdLSWNvbkRhdGFi YXNlUmVmIGljb25EYXRhYmFzZVJlZik7CisKKyAgICBQYXNzUmVmUHRyPGNhaXJvX3N1cmZhY2Vf dD4gZ2V0SWNvblN1cmZhY2VTeW5jaHJvbm91c2x5KGNvbnN0IFN0cmluZyYgcGFnZVVSTCkgY29u c3Q7CisKKyAgICBzdGF0aWMgdm9pZCBkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTChXS0ljb25EYXRh YmFzZVJlZiBpY29uRGF0YWJhc2UsIFdLVVJMUmVmIHBhZ2VVUkwsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pOworICAgIHN0YXRpYyB2b2lkIGljb25EYXRhUmVhZHlGb3JQYWdlVVJMKFdLSWNvbkRh dGFiYXNlUmVmIGljb25EYXRhYmFzZSwgV0tVUkxSZWYgcGFnZVVSTCwgY29uc3Qgdm9pZCogY2xp ZW50SW5mbyk7CisKKyAgICBXS1JldGFpblB0cjxXS0ljb25EYXRhYmFzZVJlZj4gbV93a0ljb25E YXRhYmFzZTsKKyAgICBDaGFuZ2VMaXN0ZW5lck1hcCBtX2NoYW5nZUxpc3RlbmVyczsKKyAgICBQ ZW5kaW5nSWNvblJlcXVlc3RNYXAgbV9pY29uUmVxdWVzdHM7CiB9OwogCiAjZW5kaWYgLy8gZXdr X2Zhdmljb25fZGF0YWJhc2VfcHJpdmF0ZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggM2RkYmY2NS4uZDg2MDhhYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtNDEsNiArNDEsNyBA QAogI2luY2x1ZGUgImV3a19iYWNrX2ZvcndhcmRfbGlzdF9wcml2YXRlLmgiCiAjaW5jbHVkZSAi ZXdrX2NvbnRleHQuaCIKICNpbmNsdWRlICJld2tfY29udGV4dF9wcml2YXRlLmgiCisjaW5jbHVk ZSAiZXdrX2Zhdmljb25fZGF0YWJhc2VfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19pbnRlbnRf cHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19wb3B1cF9tZW51X2l0ZW0uaCIKICNpbmNsdWRlICJl d2tfcG9wdXBfbWVudV9pdGVtX3ByaXZhdGUuaCIKQEAgLTE3MSw3ICsxNzIsNyBAQCBzdHJ1Y3Qg RXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICB7CiAgICAgICAgIC8qIFVucmVnaXN0ZXIgaWNv biBjaGFuZ2UgY2FsbGJhY2sgKi8KICAgICAgICAgRXdrX0Zhdmljb25fRGF0YWJhc2UqIGljb25E YXRhYmFzZSA9IGV3a19jb250ZXh0X2Zhdmljb25fZGF0YWJhc2VfZ2V0KGNvbnRleHQpOwotICAg ICAgICBld2tfZmF2aWNvbl9kYXRhYmFzZV9pY29uX2NoYW5nZV9jYWxsYmFja19kZWwoaWNvbkRh dGFiYXNlLCBfZXdrX3ZpZXdfb25fZmF2aWNvbl9jaGFuZ2VkKTsKKyAgICAgICAgaWNvbkRhdGFi YXNlLT51bndhdGNoQ2hhbmdlcyhfZXdrX3ZpZXdfb25fZmF2aWNvbl9jaGFuZ2VkKTsKIAogICAg ICAgICB2b2lkKiBpdGVtOwogICAgICAgICBFSU5BX0xJU1RfRlJFRShwb3B1cE1lbnVJdGVtcywg aXRlbSkKQEAgLTg0MSw3ICs4NDIsNyBAQCBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfaW5pdGlhbGl6 ZShFdmFzX09iamVjdCogZXdrVmlldywgRXdrX0NvbnRleHQqIGNvbnRleHQsIFdLUAogCiAgICAg LyogTGlzdGVuIGZvciBmYXZpY29uIGNoYW5nZXMgKi8KICAgICBFd2tfRmF2aWNvbl9EYXRhYmFz ZSogaWNvbkRhdGFiYXNlID0gZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9nZXQocHJpdi0+ Y29udGV4dCk7Ci0gICAgZXdrX2Zhdmljb25fZGF0YWJhc2VfaWNvbl9jaGFuZ2VfY2FsbGJhY2tf YWRkKGljb25EYXRhYmFzZSwgX2V3a192aWV3X29uX2Zhdmljb25fY2hhbmdlZCwgZXdrVmlldyk7 CisgICAgaWNvbkRhdGFiYXNlLT53YXRjaENoYW5nZXMoSWNvbkNoYW5nZUNhbGxiYWNrRGF0YShf ZXdrX3ZpZXdfb25fZmF2aWNvbl9jaGFuZ2VkLCBld2tWaWV3KSk7CiB9CiAKIHN0YXRpYyBFdmFz X09iamVjdCogX2V3a192aWV3X2FkZF93aXRoX3NtYXJ0KEV2YXMqIGNhbnZhcywgRXZhc19TbWFy dCogc21hcnQpCg==