99930 2012-10-21 06:07:19 -0700 [EFL][WK2] Make Ewk_Cookie_Manager members private 2012-10-21 09:00:44 -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 747082 0 cdumez 2012-10-21 06:07:19 -0700 As part of Bug 99696, this bug is for making the Ewk_Cookie_Manager class members private. 747083 1 169796 cdumez 2012-10-21 06:30:48 -0700 Created attachment 169796 Patch 747088 2 169796 kenneth 2012-10-21 07:40:06 -0700 Comment on attachment 169796 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169796&action=review > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:121 > +// Ewk_Cookie_Persistent_Storage enum validation dot at end? :) > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:133 > +// Ewk_Cookie_Accept_Policy enum validation Same 747094 3 169800 cdumez 2012-10-21 07:51:12 -0700 Created attachment 169800 Patch for landing Fix nits spotted by Kenneth. 747095 4 169800 cdumez 2012-10-21 07:52:27 -0700 Comment on attachment 169800 Patch for landing Missing reviewer name :( 747097 5 169801 cdumez 2012-10-21 07:53:33 -0700 Created attachment 169801 Patch for landing Added missing reviewer name. Sorry about that. 747104 6 169801 webkit.review.bot 2012-10-21 09:00:39 -0700 Comment on attachment 169801 Patch for landing Clearing flags on attachment: 169801 Committed r132002: <http://trac.webkit.org/changeset/132002> 747105 7 webkit.review.bot 2012-10-21 09:00:44 -0700 All reviewed patches have been landed. Closing bug. 169796 2012-10-21 06:30:48 -0700 2012-10-21 07:51:12 -0700 Patch 99930_cookieManager_cpp.patch text/plain 14367 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3M2NjMmNlLi4xODY3MzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDAg QEAKIDIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrX0Nvb2tpZV9NYW5hZ2VyIG1lbWJl cnMgcHJpdmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk5MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWtlIEV3a19Db29raWVfTWFuYWdlciBjbGFzcyBtZW1iZXJzIHByaXZhdGUuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuY3BwOgorICAgICAgICAo RXdrX0Nvb2tpZV9NYW5hZ2VyOjpFd2tfQ29va2llX01hbmFnZXIpOgorICAgICAgICAoRXdrX0Nv b2tpZV9NYW5hZ2VyOjp+RXdrX0Nvb2tpZV9NYW5hZ2VyKToKKyAgICAgICAgKEV3a19Db29raWVf TWFuYWdlcjo6c2V0UGVyc2lzdGVudFN0b3JhZ2UpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5h Z2VyOjpzZXRIVFRQQWNjZXB0UG9saWN5KToKKyAgICAgICAgKEV3a19Db29raWVfTWFuYWdlcjo6 Y2xlYXJIb3N0bmFtZUNvb2tpZXMpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjpjbGVh ckFsbENvb2tpZXMpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjp3YXRjaENoYW5nZXMp OgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjppc1dhdGNoaW5nRm9yQ2hhbmdlcyk6Cisg ICAgICAgIChFd2tfQ29va2llX01hbmFnZXI6OmdldEhvc3ROYW1lc1dpdGhDb29raWVzKToKKyAg ICAgICAgKEV3a19Db29raWVfTWFuYWdlcjo6Z2V0SFRUUEFjY2VwdFBvbGljeSk6CisgICAgICAg IChFd2tfQ29va2llX01hbmFnZXI6OmNvb2tpZXNEaWRDaGFuZ2UpOgorICAgICAgICAoZXdrX2Nv b2tpZV9tYW5hZ2VyX3BlcnNpc3RlbnRfc3RvcmFnZV9zZXQpOgorICAgICAgICAoZXdrX2Nvb2tp ZV9tYW5hZ2VyX2FjY2VwdF9wb2xpY3lfc2V0KToKKyAgICAgICAgKEdldF9Qb2xpY3lfQXN5bmNf RGF0YSk6CisgICAgICAgIChHZXRfUG9saWN5X0FzeW5jX0RhdGE6OkdldF9Qb2xpY3lfQXN5bmNf RGF0YSk6CisgICAgICAgIChld2tfY29va2llX21hbmFnZXJfYXN5bmNfYWNjZXB0X3BvbGljeV9n ZXQpOgorICAgICAgICAoR2V0X0hvc3RuYW1lc19Bc3luY19EYXRhKToKKyAgICAgICAgKEdldF9I b3N0bmFtZXNfQXN5bmNfRGF0YTo6R2V0X0hvc3RuYW1lc19Bc3luY19EYXRhKToKKyAgICAgICAg KGV3a19jb29raWVfbWFuYWdlcl9hc3luY19ob3N0bmFtZXNfd2l0aF9jb29raWVzX2dldCk6Cisg ICAgICAgIChld2tfY29va2llX21hbmFnZXJfaG9zdG5hbWVfY29va2llc19jbGVhcik6CisgICAg ICAgIChld2tfY29va2llX21hbmFnZXJfY29va2llc19jbGVhcik6CisgICAgICAgIChld2tfY29v a2llX21hbmFnZXJfY2hhbmdlc193YXRjaCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a19Db29raWVfTWFuYWdl cik6CisKKzIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGlu dGVsLmNvbT4KKwogICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrIGludGVudCBjbGFzc2VzIG1l bWJlcnMgcHJpdmF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTk4MzIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAKaW5kZXggM2NiZjdmZS4uZGE1Y2ZjMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21h bmFnZXIuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVk ZSAiZXdrX2Nvb2tpZV9tYW5hZ2VyLmgiCiAKLSNpbmNsdWRlICJTb3VwQ29va2llUGVyc2lzdGVu dFN0b3JhZ2VUeXBlLmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCiAjaW5jbHVkZSAiV0tBcnJh eS5oIgogI2luY2x1ZGUgIldLU3RyaW5nLmgiCkBAIC00MCw3OSArMzksMTE3IEBACiAKIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAKLXN0YXRpYyB2b2lkIGNvb2tpZXNEaWRDaGFuZ2UoV0tDb29r aWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLQogRXdrX0Nvb2tpZV9NYW5h Z2VyOjpFd2tfQ29va2llX01hbmFnZXIoV0tDb29raWVNYW5hZ2VyUmVmIGNvb2tpZU1hbmFnZXJS ZWYpCi0gICAgOiB3a0Nvb2tpZU1hbmFnZXIoY29va2llTWFuYWdlclJlZikKKyAgICA6IG1fd2tD b29raWVNYW5hZ2VyKGNvb2tpZU1hbmFnZXJSZWYpCiB7CiAgICAgV0tDb29raWVNYW5hZ2VyQ2xp ZW50IHdrQ29va2llTWFuYWdlckNsaWVudCA9IHsKICAgICAgICAga1dLQ29va2llTWFuYWdlckNs aWVudEN1cnJlbnRWZXJzaW9uLAogICAgICAgICB0aGlzLCAvLyBjbGllbnRJbmZvCiAgICAgICAg IGNvb2tpZXNEaWRDaGFuZ2UKICAgICB9OwotICAgIFdLQ29va2llTWFuYWdlclNldENsaWVudCh3 a0Nvb2tpZU1hbmFnZXIuZ2V0KCksICZ3a0Nvb2tpZU1hbmFnZXJDbGllbnQpOworICAgIFdLQ29v a2llTWFuYWdlclNldENsaWVudChtX3drQ29va2llTWFuYWdlci5nZXQoKSwgJndrQ29va2llTWFu YWdlckNsaWVudCk7CiB9CiAKIEV3a19Db29raWVfTWFuYWdlcjo6fkV3a19Db29raWVfTWFuYWdl cigpCiB7CisgICAgaWYgKGlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkpCisgICAgICAgIFdLQ29va2ll TWFuYWdlclN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgp KTsKK30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OnNldFBlcnNpc3RlbnRTdG9yYWdlKGNv bnN0IFN0cmluZyYgZmlsZW5hbWUsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUgc3Rv cmFnZSkKK3sKKyAgICBib29sIGlzV2F0Y2hpbmdDaGFuZ2VzID0gaXNXYXRjaGluZ0ZvckNoYW5n ZXMoKTsKKyAgICBpZiAoaXNXYXRjaGluZ0NoYW5nZXMpCisgICAgICAgIFdLQ29va2llTWFuYWdl clN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKwor ICAgIHRvSW1wbChtX3drQ29va2llTWFuYWdlci5nZXQoKSktPnNldENvb2tpZVBlcnNpc3RlbnRT dG9yYWdlKGZpbGVuYW1lLCBzdG9yYWdlKTsKKworICAgIGlmIChpc1dhdGNoaW5nQ2hhbmdlcykK KyAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tD b29raWVNYW5hZ2VyLmdldCgpKTsKK30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OnNldEhU VFBBY2NlcHRQb2xpY3koV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkKK3sKKyAgICBX S0Nvb2tpZU1hbmFnZXJTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KG1fd2tDb29raWVNYW5hZ2Vy LmdldCgpLCBwb2xpY3kpOworfQorCit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Y2xlYXJIb3N0 bmFtZUNvb2tpZXMoY29uc3QgU3RyaW5nJiBob3N0bmFtZSkKK3sKKyAgICB0b0ltcGwobV93a0Nv b2tpZU1hbmFnZXIuZ2V0KCkpLT5kZWxldGVDb29raWVzRm9ySG9zdG5hbWUoaG9zdG5hbWUpOwor fQorCit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Y2xlYXJBbGxDb29raWVzKCkKK3sKKyAgICBX S0Nvb2tpZU1hbmFnZXJEZWxldGVBbGxDb29raWVzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsK K30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OndhdGNoQ2hhbmdlcyhjb25zdCBDb29raWVf Q2hhbmdlX0hhbmRsZXImIGNoYW5nZUhhbmRsZXIpCit7CisgICAgbV9jaGFuZ2VIYW5kbGVyID0g Y2hhbmdlSGFuZGxlcjsKKwogICAgIGlmIChjaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKQotICAgICAg ICBXS0Nvb2tpZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcyh3a0Nvb2tpZU1hbmFn ZXIuZ2V0KCkpOworICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2VydmluZ0Nvb2tpZUNo YW5nZXMobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgIGVsc2UKKyAgICAgICAgV0tDb29r aWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMobV93a0Nvb2tpZU1hbmFnZXIuZ2V0 KCkpOwogfQogCi0jZGVmaW5lIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1h bmFnZXIsIHdrTWFuYWdlcl8sIC4uLikgICAgXAotICAgIGlmICghKG1hbmFnZXIpKSB7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg RUlOQV9MT0dfQ1JJVCgibWFuYWdlciBpcyBOVUxMLiIpOyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIH0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBpZiAo IShtYW5hZ2VyKS0+d2tDb29raWVNYW5hZ2VyKSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQoIm1hbmFnZXItPndrQ29va2llTWFuYWdl ciBpcyBOVUxMLiIpOyAgICAgICAgICAgICAgXAotICAgICAgICByZXR1cm4gX19WQV9BUkdTX187 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICB9ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgV0tDb29raWVNYW5hZ2VyUmVmIHdrTWFuYWdlcl8gPSAobWFuYWdlcikt PndrQ29va2llTWFuYWdlci5nZXQoKQorYm9vbCBFd2tfQ29va2llX01hbmFnZXI6OmlzV2F0Y2hp bmdGb3JDaGFuZ2VzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Ym9vbD4obV9j aGFuZ2VIYW5kbGVyLmNhbGxiYWNrKTsKK30KIAotLy8gRXdrX0Nvb2tpZV9BY2NlcHRfUG9saWN5 IGVudW0gdmFsaWRhdGlvbgotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lF X0FDQ0VQVF9QT0xJQ1lfQUxXQVlTLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5QWx3YXlzKTsK LUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9BQ0NFUFRfUE9MSUNZX05F VkVSLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIpOwotQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfTk9fVEhJUkRfUEFSVFksIGtXS0hU VFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbik7Cit2b2lkIEV3 a19Db29raWVfTWFuYWdlcjo6Z2V0SG9zdE5hbWVzV2l0aENvb2tpZXMoV0tDb29raWVNYW5hZ2Vy R2V0Q29va2llSG9zdG5hbWVzRnVuY3Rpb24gY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKSBjb25z dAoreworICAgIFdLQ29va2llTWFuYWdlckdldEhvc3RuYW1lc1dpdGhDb29raWVzKG1fd2tDb29r aWVNYW5hZ2VyLmdldCgpLCB1c2VyRGF0YSwgY2FsbGJhY2spOworfQogCi0vLyBFd2tfQ29va2ll X1BlcnNpc3RlbnRfU3RvcmFnZSBlbnVtIHZhbGlkYXRpb24KLUNPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oRVdLX0NPT0tJRV9QRVJTSVNURU5UX1NUT1JBR0VfVEVYVCwgU291cENvb2tpZVBl cnNpc3RlbnRTdG9yYWdlVGV4dCk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19D T09LSUVfUEVSU0lTVEVOVF9TVE9SQUdFX1NRTElURSwgU291cENvb2tpZVBlcnNpc3RlbnRTdG9y YWdlU1FMaXRlKTsKK3ZvaWQgRXdrX0Nvb2tpZV9NYW5hZ2VyOjpnZXRIVFRQQWNjZXB0UG9saWN5 KFdLQ29va2llTWFuYWdlckdldEhUVFBDb29raWVBY2NlcHRQb2xpY3lGdW5jdGlvbiBjYWxsYmFj aywgdm9pZCogdXNlckRhdGEpIGNvbnN0Cit7CisgICAgV0tDb29raWVNYW5hZ2VyR2V0SFRUUENv b2tpZUFjY2VwdFBvbGljeShtX3drQ29va2llTWFuYWdlci5nZXQoKSwgdXNlckRhdGEsIGNhbGxi YWNrKTsKK30KIAotc3RhdGljIHZvaWQgY29va2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJS ZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Y29v a2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p CiB7CiAgICAgRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyID0gc3RhdGljX2Nhc3Q8RXdrX0Nv b2tpZV9NYW5hZ2VyKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpOwogCi0gICAgaWYg KCFtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKQorICAgIGlmICghbWFuYWdlci0+aXNX YXRjaGluZ0ZvckNoYW5nZXMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbWFuYWdlci0+Y2hh bmdlSGFuZGxlci5jYWxsYmFjayhtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLnVzZXJEYXRhKTsKKyAg ICBtYW5hZ2VyLT5tX2NoYW5nZUhhbmRsZXIuY2FsbGJhY2sobWFuYWdlci0+bV9jaGFuZ2VIYW5k bGVyLnVzZXJEYXRhKTsKIH0KIAorLy8gRXdrX0Nvb2tpZV9QZXJzaXN0ZW50X1N0b3JhZ2UgZW51 bSB2YWxpZGF0aW9uCitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT09LSUVfUEVS U0lTVEVOVF9TVE9SQUdFX1RFWFQsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVRleHQpOwor Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lFX1BFUlNJU1RFTlRfU1RPUkFH RV9TUUxJVEUsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVNRTGl0ZSk7CisKIHZvaWQgZXdr X2Nvb2tpZV9tYW5hZ2VyX3BlcnNpc3RlbnRfc3RvcmFnZV9zZXQoRXdrX0Nvb2tpZV9NYW5hZ2Vy KiBtYW5hZ2VyLCBjb25zdCBjaGFyKiBmaWxlbmFtZSwgRXdrX0Nvb2tpZV9QZXJzaXN0ZW50X1N0 b3JhZ2Ugc3RvcmFnZSkKIHsKLSAgICBFV0tfQ09PS0lFX01BTkFHRVJfV0tfR0VUX09SX1JFVFVS TihtYW5hZ2VyLCB3a01hbmFnZXIpOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKG1h bmFnZXIpOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGZpbGVuYW1lKTsKIAotICAg IGlmIChtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKQotICAgICAgICBXS0Nvb2tpZU1h bmFnZXJTdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcyh3a01hbmFnZXIpOwotCi0gICAgdG9JbXBs KHdrTWFuYWdlciktPnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKFN0cmluZzo6ZnJvbVVURjgo ZmlsZW5hbWUpLCBzdG9yYWdlKTsKLQotICAgIGlmIChtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLmNh bGxiYWNrKQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2VydmluZ0Nvb2tpZUNoYW5n ZXMod2tNYW5hZ2VyKTsKKyAgICBtYW5hZ2VyLT5zZXRQZXJzaXN0ZW50U3RvcmFnZShTdHJpbmc6 OmZyb21VVEY4KGZpbGVuYW1lKSwgc3RhdGljX2Nhc3Q8U291cENvb2tpZVBlcnNpc3RlbnRTdG9y YWdlVHlwZT4oc3RvcmFnZSkpOwogfQogCisvLyBFd2tfQ29va2llX0FjY2VwdF9Qb2xpY3kgZW51 bSB2YWxpZGF0aW9uCitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT09LSUVfQUND RVBUX1BPTElDWV9BTFdBWVMsIGtXS0hUVFBDb29raWVBY2NlcHRQb2xpY3lBbHdheXMpOworQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfTkVWRVIs IGtXS0hUVFBDb29raWVBY2NlcHRQb2xpY3lOZXZlcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKEVXS19DT09LSUVfQUNDRVBUX1BPTElDWV9OT19USElSRF9QQVJUWSwga1dLSFRUUENv b2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluKTsKKwogdm9pZCBld2tf Y29va2llX21hbmFnZXJfYWNjZXB0X3BvbGljeV9zZXQoRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5h Z2VyLCBFd2tfQ29va2llX0FjY2VwdF9Qb2xpY3kgcG9saWN5KQogewotICAgIEVXS19DT09LSUVf TUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFnZXIsIHdrTWFuYWdlcik7CisgICAgRUlOQV9T QUZFVFlfT05fTlVMTF9SRVRVUk4obWFuYWdlcik7CiAKLSAgICBXS0Nvb2tpZU1hbmFnZXJTZXRI VFRQQ29va2llQWNjZXB0UG9saWN5KHdrTWFuYWdlciwgc3RhdGljX2Nhc3Q8V0tIVFRQQ29va2ll QWNjZXB0UG9saWN5Pihwb2xpY3kpKTsKKyAgICBtYW5hZ2VyLT5zZXRIVFRQQWNjZXB0UG9saWN5 KHN0YXRpY19jYXN0PFdLSFRUUENvb2tpZUFjY2VwdFBvbGljeT4ocG9saWN5KSk7CiB9CiAKIHN0 cnVjdCBHZXRfUG9saWN5X0FzeW5jX0RhdGEgewogICAgIEV3a19Db29raWVfTWFuYWdlcl9Bc3lu Y19Qb2xpY3lfR2V0X0NiIGNhbGxiYWNrOwogICAgIHZvaWQqIHVzZXJEYXRhOworCisgICAgR2V0 X1BvbGljeV9Bc3luY19EYXRhKEV3a19Db29raWVfTWFuYWdlcl9Bc3luY19Qb2xpY3lfR2V0X0Ni IGNhbGxiYWNrLCB2b2lkKiB1c2VyRGF0YSkKKyAgICAgICAgOiBjYWxsYmFjayhjYWxsYmFjaykK KyAgICAgICAgLCB1c2VyRGF0YSh1c2VyRGF0YSkKKyAgICB7IH0KIH07CiAKIHN0YXRpYyB2b2lk IGdldEFjY2VwdFBvbGljeUNhbGxiYWNrKFdLSFRUUENvb2tpZUFjY2VwdFBvbGljeSBwb2xpY3ks IFdLRXJyb3JSZWYgd2tFcnJvciwgdm9pZCogZGF0YSkKQEAgLTEyNywxOSArMTY0LDIxIEBAIHN0 YXRpYyB2b2lkIGdldEFjY2VwdFBvbGljeUNhbGxiYWNrKFdLSFRUUENvb2tpZUFjY2VwdFBvbGlj eSBwb2xpY3ksIFdLRXJyb3JSZWYKIAogdm9pZCBld2tfY29va2llX21hbmFnZXJfYXN5bmNfYWNj ZXB0X3BvbGljeV9nZXQoY29uc3QgRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyLCBFd2tfQ29v a2llX01hbmFnZXJfQXN5bmNfUG9saWN5X0dldF9DYiBjYWxsYmFjaywgdm9pZCogZGF0YSkKIHsK LSAgICBFV0tfQ09PS0lFX01BTkFHRVJfV0tfR0VUX09SX1JFVFVSTihtYW5hZ2VyLCB3a01hbmFn ZXIpOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKG1hbmFnZXIpOwogICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOKGNhbGxiYWNrKTsKIAotICAgIEdldF9Qb2xpY3lfQXN5bmNf RGF0YSogY2FsbGJhY2tEYXRhID0gbmV3IEdldF9Qb2xpY3lfQXN5bmNfRGF0YTsKLSAgICBjYWxs YmFja0RhdGEtPmNhbGxiYWNrID0gY2FsbGJhY2s7Ci0gICAgY2FsbGJhY2tEYXRhLT51c2VyRGF0 YSA9IGRhdGE7Ci0KLSAgICBXS0Nvb2tpZU1hbmFnZXJHZXRIVFRQQ29va2llQWNjZXB0UG9saWN5 KHdrTWFuYWdlciwgY2FsbGJhY2tEYXRhLCBnZXRBY2NlcHRQb2xpY3lDYWxsYmFjayk7CisgICAg R2V0X1BvbGljeV9Bc3luY19EYXRhKiBjYWxsYmFja0RhdGEgPSBuZXcgR2V0X1BvbGljeV9Bc3lu Y19EYXRhKGNhbGxiYWNrLCBkYXRhKTsKKyAgICBtYW5hZ2VyLT5nZXRIVFRQQWNjZXB0UG9saWN5 KGdldEFjY2VwdFBvbGljeUNhbGxiYWNrLCBjYWxsYmFja0RhdGEpOwogfQogCiBzdHJ1Y3QgR2V0 X0hvc3RuYW1lc19Bc3luY19EYXRhIHsKICAgICBFd2tfQ29va2llX01hbmFnZXJfQXN5bmNfSG9z dG5hbWVzX0dldF9DYiBjYWxsYmFjazsKICAgICB2b2lkKiB1c2VyRGF0YTsKKworICAgIEdldF9I b3N0bmFtZXNfQXN5bmNfRGF0YShFd2tfQ29va2llX01hbmFnZXJfQXN5bmNfSG9zdG5hbWVzX0dl dF9DYiBjYWxsYmFjaywgdm9pZCogdXNlckRhdGEpCisgICAgICAgIDogY2FsbGJhY2soY2FsbGJh Y2spCisgICAgICAgICwgdXNlckRhdGEodXNlckRhdGEpCisgICAgeyB9CiB9OwogCiBzdGF0aWMg dm9pZCBnZXRIb3N0bmFtZXNXaXRoQ29va2llc0NhbGxiYWNrKFdLQXJyYXlSZWYgd2tIb3N0bmFt ZXMsIFdLRXJyb3JSZWYgd2tFcnJvciwgdm9pZCogY29udGV4dCkKQEAgLTE2OCw0MCArMjA3LDMx IEBAIHN0YXRpYyB2b2lkIGdldEhvc3RuYW1lc1dpdGhDb29raWVzQ2FsbGJhY2soV0tBcnJheVJl ZiB3a0hvc3RuYW1lcywgV0tFcnJvclJlZiB3CiAKIHZvaWQgZXdrX2Nvb2tpZV9tYW5hZ2VyX2Fz eW5jX2hvc3RuYW1lc193aXRoX2Nvb2tpZXNfZ2V0KGNvbnN0IEV3a19Db29raWVfTWFuYWdlciog bWFuYWdlciwgRXdrX0Nvb2tpZV9NYW5hZ2VyX0FzeW5jX0hvc3RuYW1lc19HZXRfQ2IgY2FsbGJh Y2ssIHZvaWQqIGRhdGEpCiB7Ci0gICAgRVdLX0NPT0tJRV9NQU5BR0VSX1dLX0dFVF9PUl9SRVRV Uk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTiht YW5hZ2VyKTsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjYWxsYmFjayk7CiAKLSAg ICBHZXRfSG9zdG5hbWVzX0FzeW5jX0RhdGEqIGNhbGxiYWNrRGF0YSA9IG5ldyBHZXRfSG9zdG5h bWVzX0FzeW5jX0RhdGE7Ci0gICAgY2FsbGJhY2tEYXRhLT5jYWxsYmFjayA9IGNhbGxiYWNrOwot ICAgIGNhbGxiYWNrRGF0YS0+dXNlckRhdGEgPSBkYXRhOwotCi0gICAgV0tDb29raWVNYW5hZ2Vy R2V0SG9zdG5hbWVzV2l0aENvb2tpZXMod2tNYW5hZ2VyLCBjYWxsYmFja0RhdGEsIGdldEhvc3Ru YW1lc1dpdGhDb29raWVzQ2FsbGJhY2spOworICAgIEdldF9Ib3N0bmFtZXNfQXN5bmNfRGF0YSog Y2FsbGJhY2tEYXRhID0gbmV3IEdldF9Ib3N0bmFtZXNfQXN5bmNfRGF0YShjYWxsYmFjaywgZGF0 YSk7CisgICAgbWFuYWdlci0+Z2V0SG9zdE5hbWVzV2l0aENvb2tpZXMoZ2V0SG9zdG5hbWVzV2l0 aENvb2tpZXNDYWxsYmFjaywgY2FsbGJhY2tEYXRhKTsKIH0KIAotdm9pZCBld2tfY29va2llX21h bmFnZXJfaG9zdG5hbWVfY29va2llc19jbGVhcihFd2tfQ29va2llX01hbmFnZXIqIG1hbmFnZXIs IGNvbnN0IGNoYXIqIGhvc3ROYW1lKQordm9pZCBld2tfY29va2llX21hbmFnZXJfaG9zdG5hbWVf Y29va2llc19jbGVhcihFd2tfQ29va2llX01hbmFnZXIqIG1hbmFnZXIsIGNvbnN0IGNoYXIqIGhv c3RuYW1lKQogewotICAgIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFn ZXIsIHdrTWFuYWdlcik7Ci0gICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oaG9zdE5hbWUp OworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKG1hbmFnZXIpOworICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOKGhvc3RuYW1lKTsKIAotICAgIFdLUmV0YWluUHRyPFdLU3RyaW5n UmVmPiB3a0hvc3ROYW1lKEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGhv c3ROYW1lKSk7Ci0gICAgV0tDb29raWVNYW5hZ2VyRGVsZXRlQ29va2llc0Zvckhvc3RuYW1lKHdr TWFuYWdlciwgd2tIb3N0TmFtZS5nZXQoKSk7CisgICAgbWFuYWdlci0+Y2xlYXJIb3N0bmFtZUNv b2tpZXMoU3RyaW5nOjpmcm9tVVRGOChob3N0bmFtZSkpOwogfQogCiB2b2lkIGV3a19jb29raWVf bWFuYWdlcl9jb29raWVzX2NsZWFyKEV3a19Db29raWVfTWFuYWdlciogbWFuYWdlcikKIHsKLSAg ICBFV0tfQ09PS0lFX01BTkFHRVJfV0tfR0VUX09SX1JFVFVSTihtYW5hZ2VyLCB3a01hbmFnZXIp OworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKG1hbmFnZXIpOwogCi0gICAgV0tDb29r aWVNYW5hZ2VyRGVsZXRlQWxsQ29va2llcyh3a01hbmFnZXIpOworICAgIG1hbmFnZXItPmNsZWFy QWxsQ29va2llcygpOwogfQogCiB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9jaGFuZ2VzX3dhdGNo KEV3a19Db29raWVfTWFuYWdlciogbWFuYWdlciwgRXdrX0Nvb2tpZV9NYW5hZ2VyX0NoYW5nZXNf V2F0Y2hfQ2IgY2FsbGJhY2ssIHZvaWQqIGRhdGEpCiB7Ci0gICAgRVdLX0NPT0tJRV9NQU5BR0VS X1dLX0dFVF9PUl9SRVRVUk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKLQotICAgIG1hbmFnZXItPmNo YW5nZUhhbmRsZXIgPSBDb29raWVfQ2hhbmdlX0hhbmRsZXIoY2FsbGJhY2ssIGRhdGEpOworICAg IEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKG1hbmFnZXIpOwogCi0gICAgaWYgKGNhbGxiYWNr KQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMod2tN YW5hZ2VyKTsKLSAgICBlbHNlCi0gICAgICAgIFdLQ29va2llTWFuYWdlclN0b3BPYnNlcnZpbmdD b29raWVDaGFuZ2VzKHdrTWFuYWdlcik7CisgICAgbWFuYWdlci0+d2F0Y2hDaGFuZ2VzKENvb2tp ZV9DaGFuZ2VfSGFuZGxlcihjYWxsYmFjaywgZGF0YSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlcl9wcml2 YXRlLmgKaW5kZXggYjc1NzlhYS4uOGMzMmY4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5o CkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVmIGV3a19jb29raWVfbWFuYWdlcl9wcml2YXRlX2gK ICNkZWZpbmUgZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGVfaAogCisjaW5jbHVkZSAiU291cENv b2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZS5oIgogI2luY2x1ZGUgIldLQ29va2llTWFuYWdlci5o IgogI2luY2x1ZGUgIldLUmV0YWluUHRyLmgiCiAjaW5jbHVkZSAiZXdrX2Nvb2tpZV9tYW5hZ2Vy LmgiCkBAIC00OSw5ICs1MCw2IEBAIHN0cnVjdCBDb29raWVfQ2hhbmdlX0hhbmRsZXIgewogCiBj bGFzcyBFd2tfQ29va2llX01hbmFnZXIgewogcHVibGljOgotICAgIFdLUmV0YWluUHRyPFdLQ29v a2llTWFuYWdlclJlZj4gd2tDb29raWVNYW5hZ2VyOwotICAgIENvb2tpZV9DaGFuZ2VfSGFuZGxl ciBjaGFuZ2VIYW5kbGVyOwotCiAgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrX0Nvb2tpZV9NYW5h Z2VyPiBjcmVhdGUoV0tDb29raWVNYW5hZ2VyUmVmIGNvb2tpZU1hbmFnZXJSZWYpCiAgICAgewog ICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEV3a19Db29raWVfTWFuYWdlcihjb29raWVNYW5h Z2VyUmVmKSk7CkBAIC01OSw4ICs1NywyNiBAQCBwdWJsaWM6CiAKICAgICB+RXdrX0Nvb2tpZV9N YW5hZ2VyKCk7CiAKKyAgICB2b2lkIHNldFBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYg ZmlsZW5hbWUsIFdlYktpdDo6U291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSBzdG9yYWdl KTsKKworICAgIHZvaWQgZ2V0SFRUUEFjY2VwdFBvbGljeShXS0Nvb2tpZU1hbmFnZXJHZXRIVFRQ Q29va2llQWNjZXB0UG9saWN5RnVuY3Rpb24gY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKSBjb25z dDsKKyAgICB2b2lkIHNldEhUVFBBY2NlcHRQb2xpY3koV0tIVFRQQ29va2llQWNjZXB0UG9saWN5 IHBvbGljeSk7CisKKyAgICB2b2lkIGNsZWFySG9zdG5hbWVDb29raWVzKGNvbnN0IFN0cmluZyYg aG9zdG5hbWUpOworICAgIHZvaWQgY2xlYXJBbGxDb29raWVzKCk7CisKKyAgICB2b2lkIGdldEhv c3ROYW1lc1dpdGhDb29raWVzKFdLQ29va2llTWFuYWdlckdldENvb2tpZUhvc3RuYW1lc0Z1bmN0 aW9uIGNhbGxiYWNrLCB2b2lkKiB1c2VyRGF0YSkgY29uc3Q7CisgICAgdm9pZCB3YXRjaENoYW5n ZXMoY29uc3QgQ29va2llX0NoYW5nZV9IYW5kbGVyJiBjaGFuZ2VIYW5kbGVyKTsKKwogcHJpdmF0 ZToKICAgICBleHBsaWNpdCBFd2tfQ29va2llX01hbmFnZXIoV0tDb29raWVNYW5hZ2VyUmVmIGNv b2tpZU1hbmFnZXJSZWYpOworCisgICAgYm9vbCBpc1dhdGNoaW5nRm9yQ2hhbmdlcygpIGNvbnN0 OworCisgICAgc3RhdGljIHZvaWQgY29va2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJSZWYs IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOworCisgICAgV0tSZXRhaW5QdHI8V0tDb29raWVNYW5h Z2VyUmVmPiBtX3drQ29va2llTWFuYWdlcjsKKyAgICBDb29raWVfQ2hhbmdlX0hhbmRsZXIgbV9j aGFuZ2VIYW5kbGVyOwogfTsKIAogI2VuZGlmIC8vIGV3a19jb29raWVfbWFuYWdlcl9wcml2YXRl X2gK 169800 2012-10-21 07:51:12 -0700 2012-10-21 07:53:33 -0700 Patch for landing 99930_cookieManager_cpp.patch text/plain 14369 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3M2NjMmNlLi4xODY3MzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDAg QEAKIDIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrX0Nvb2tpZV9NYW5hZ2VyIG1lbWJl cnMgcHJpdmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk5MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWtlIEV3a19Db29raWVfTWFuYWdlciBjbGFzcyBtZW1iZXJzIHByaXZhdGUuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuY3BwOgorICAgICAgICAo RXdrX0Nvb2tpZV9NYW5hZ2VyOjpFd2tfQ29va2llX01hbmFnZXIpOgorICAgICAgICAoRXdrX0Nv b2tpZV9NYW5hZ2VyOjp+RXdrX0Nvb2tpZV9NYW5hZ2VyKToKKyAgICAgICAgKEV3a19Db29raWVf TWFuYWdlcjo6c2V0UGVyc2lzdGVudFN0b3JhZ2UpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5h Z2VyOjpzZXRIVFRQQWNjZXB0UG9saWN5KToKKyAgICAgICAgKEV3a19Db29raWVfTWFuYWdlcjo6 Y2xlYXJIb3N0bmFtZUNvb2tpZXMpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjpjbGVh ckFsbENvb2tpZXMpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjp3YXRjaENoYW5nZXMp OgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjppc1dhdGNoaW5nRm9yQ2hhbmdlcyk6Cisg ICAgICAgIChFd2tfQ29va2llX01hbmFnZXI6OmdldEhvc3ROYW1lc1dpdGhDb29raWVzKToKKyAg ICAgICAgKEV3a19Db29raWVfTWFuYWdlcjo6Z2V0SFRUUEFjY2VwdFBvbGljeSk6CisgICAgICAg IChFd2tfQ29va2llX01hbmFnZXI6OmNvb2tpZXNEaWRDaGFuZ2UpOgorICAgICAgICAoZXdrX2Nv b2tpZV9tYW5hZ2VyX3BlcnNpc3RlbnRfc3RvcmFnZV9zZXQpOgorICAgICAgICAoZXdrX2Nvb2tp ZV9tYW5hZ2VyX2FjY2VwdF9wb2xpY3lfc2V0KToKKyAgICAgICAgKEdldF9Qb2xpY3lfQXN5bmNf RGF0YSk6CisgICAgICAgIChHZXRfUG9saWN5X0FzeW5jX0RhdGE6OkdldF9Qb2xpY3lfQXN5bmNf RGF0YSk6CisgICAgICAgIChld2tfY29va2llX21hbmFnZXJfYXN5bmNfYWNjZXB0X3BvbGljeV9n ZXQpOgorICAgICAgICAoR2V0X0hvc3RuYW1lc19Bc3luY19EYXRhKToKKyAgICAgICAgKEdldF9I b3N0bmFtZXNfQXN5bmNfRGF0YTo6R2V0X0hvc3RuYW1lc19Bc3luY19EYXRhKToKKyAgICAgICAg KGV3a19jb29raWVfbWFuYWdlcl9hc3luY19ob3N0bmFtZXNfd2l0aF9jb29raWVzX2dldCk6Cisg ICAgICAgIChld2tfY29va2llX21hbmFnZXJfaG9zdG5hbWVfY29va2llc19jbGVhcik6CisgICAg ICAgIChld2tfY29va2llX21hbmFnZXJfY29va2llc19jbGVhcik6CisgICAgICAgIChld2tfY29v a2llX21hbmFnZXJfY2hhbmdlc193YXRjaCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a19Db29raWVfTWFuYWdl cik6CisKKzIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGlu dGVsLmNvbT4KKwogICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrIGludGVudCBjbGFzc2VzIG1l bWJlcnMgcHJpdmF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTk4MzIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAKaW5kZXggM2NiZjdmZS4uZDM3ZGE2ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21h bmFnZXIuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVk ZSAiZXdrX2Nvb2tpZV9tYW5hZ2VyLmgiCiAKLSNpbmNsdWRlICJTb3VwQ29va2llUGVyc2lzdGVu dFN0b3JhZ2VUeXBlLmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCiAjaW5jbHVkZSAiV0tBcnJh eS5oIgogI2luY2x1ZGUgIldLU3RyaW5nLmgiCkBAIC00MCw3OSArMzksMTE3IEBACiAKIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAKLXN0YXRpYyB2b2lkIGNvb2tpZXNEaWRDaGFuZ2UoV0tDb29r aWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLQogRXdrX0Nvb2tpZV9NYW5h Z2VyOjpFd2tfQ29va2llX01hbmFnZXIoV0tDb29raWVNYW5hZ2VyUmVmIGNvb2tpZU1hbmFnZXJS ZWYpCi0gICAgOiB3a0Nvb2tpZU1hbmFnZXIoY29va2llTWFuYWdlclJlZikKKyAgICA6IG1fd2tD b29raWVNYW5hZ2VyKGNvb2tpZU1hbmFnZXJSZWYpCiB7CiAgICAgV0tDb29raWVNYW5hZ2VyQ2xp ZW50IHdrQ29va2llTWFuYWdlckNsaWVudCA9IHsKICAgICAgICAga1dLQ29va2llTWFuYWdlckNs aWVudEN1cnJlbnRWZXJzaW9uLAogICAgICAgICB0aGlzLCAvLyBjbGllbnRJbmZvCiAgICAgICAg IGNvb2tpZXNEaWRDaGFuZ2UKICAgICB9OwotICAgIFdLQ29va2llTWFuYWdlclNldENsaWVudCh3 a0Nvb2tpZU1hbmFnZXIuZ2V0KCksICZ3a0Nvb2tpZU1hbmFnZXJDbGllbnQpOworICAgIFdLQ29v a2llTWFuYWdlclNldENsaWVudChtX3drQ29va2llTWFuYWdlci5nZXQoKSwgJndrQ29va2llTWFu YWdlckNsaWVudCk7CiB9CiAKIEV3a19Db29raWVfTWFuYWdlcjo6fkV3a19Db29raWVfTWFuYWdl cigpCiB7CisgICAgaWYgKGlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkpCisgICAgICAgIFdLQ29va2ll TWFuYWdlclN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgp KTsKK30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OnNldFBlcnNpc3RlbnRTdG9yYWdlKGNv bnN0IFN0cmluZyYgZmlsZW5hbWUsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUgc3Rv cmFnZSkKK3sKKyAgICBib29sIGlzV2F0Y2hpbmdDaGFuZ2VzID0gaXNXYXRjaGluZ0ZvckNoYW5n ZXMoKTsKKyAgICBpZiAoaXNXYXRjaGluZ0NoYW5nZXMpCisgICAgICAgIFdLQ29va2llTWFuYWdl clN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKwor ICAgIHRvSW1wbChtX3drQ29va2llTWFuYWdlci5nZXQoKSktPnNldENvb2tpZVBlcnNpc3RlbnRT dG9yYWdlKGZpbGVuYW1lLCBzdG9yYWdlKTsKKworICAgIGlmIChpc1dhdGNoaW5nQ2hhbmdlcykK KyAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tD b29raWVNYW5hZ2VyLmdldCgpKTsKK30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OnNldEhU VFBBY2NlcHRQb2xpY3koV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkKK3sKKyAgICBX S0Nvb2tpZU1hbmFnZXJTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KG1fd2tDb29raWVNYW5hZ2Vy LmdldCgpLCBwb2xpY3kpOworfQorCit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Y2xlYXJIb3N0 bmFtZUNvb2tpZXMoY29uc3QgU3RyaW5nJiBob3N0bmFtZSkKK3sKKyAgICB0b0ltcGwobV93a0Nv b2tpZU1hbmFnZXIuZ2V0KCkpLT5kZWxldGVDb29raWVzRm9ySG9zdG5hbWUoaG9zdG5hbWUpOwor fQorCit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Y2xlYXJBbGxDb29raWVzKCkKK3sKKyAgICBX S0Nvb2tpZU1hbmFnZXJEZWxldGVBbGxDb29raWVzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsK K30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OndhdGNoQ2hhbmdlcyhjb25zdCBDb29raWVf Q2hhbmdlX0hhbmRsZXImIGNoYW5nZUhhbmRsZXIpCit7CisgICAgbV9jaGFuZ2VIYW5kbGVyID0g Y2hhbmdlSGFuZGxlcjsKKwogICAgIGlmIChjaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKQotICAgICAg ICBXS0Nvb2tpZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcyh3a0Nvb2tpZU1hbmFn ZXIuZ2V0KCkpOworICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2VydmluZ0Nvb2tpZUNo YW5nZXMobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgIGVsc2UKKyAgICAgICAgV0tDb29r aWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMobV93a0Nvb2tpZU1hbmFnZXIuZ2V0 KCkpOwogfQogCi0jZGVmaW5lIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1h bmFnZXIsIHdrTWFuYWdlcl8sIC4uLikgICAgXAotICAgIGlmICghKG1hbmFnZXIpKSB7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg RUlOQV9MT0dfQ1JJVCgibWFuYWdlciBpcyBOVUxMLiIpOyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIH0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBpZiAo IShtYW5hZ2VyKS0+d2tDb29raWVNYW5hZ2VyKSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQoIm1hbmFnZXItPndrQ29va2llTWFuYWdl ciBpcyBOVUxMLiIpOyAgICAgICAgICAgICAgXAotICAgICAgICByZXR1cm4gX19WQV9BUkdTX187 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICB9ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgV0tDb29raWVNYW5hZ2VyUmVmIHdrTWFuYWdlcl8gPSAobWFuYWdlcikt PndrQ29va2llTWFuYWdlci5nZXQoKQorYm9vbCBFd2tfQ29va2llX01hbmFnZXI6OmlzV2F0Y2hp bmdGb3JDaGFuZ2VzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Ym9vbD4obV9j aGFuZ2VIYW5kbGVyLmNhbGxiYWNrKTsKK30KIAotLy8gRXdrX0Nvb2tpZV9BY2NlcHRfUG9saWN5 IGVudW0gdmFsaWRhdGlvbgotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lF X0FDQ0VQVF9QT0xJQ1lfQUxXQVlTLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5QWx3YXlzKTsK LUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9BQ0NFUFRfUE9MSUNZX05F VkVSLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIpOwotQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfTk9fVEhJUkRfUEFSVFksIGtXS0hU VFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbik7Cit2b2lkIEV3 a19Db29raWVfTWFuYWdlcjo6Z2V0SG9zdE5hbWVzV2l0aENvb2tpZXMoV0tDb29raWVNYW5hZ2Vy R2V0Q29va2llSG9zdG5hbWVzRnVuY3Rpb24gY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKSBjb25z dAoreworICAgIFdLQ29va2llTWFuYWdlckdldEhvc3RuYW1lc1dpdGhDb29raWVzKG1fd2tDb29r aWVNYW5hZ2VyLmdldCgpLCB1c2VyRGF0YSwgY2FsbGJhY2spOworfQogCi0vLyBFd2tfQ29va2ll X1BlcnNpc3RlbnRfU3RvcmFnZSBlbnVtIHZhbGlkYXRpb24KLUNPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oRVdLX0NPT0tJRV9QRVJTSVNURU5UX1NUT1JBR0VfVEVYVCwgU291cENvb2tpZVBl cnNpc3RlbnRTdG9yYWdlVGV4dCk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19D T09LSUVfUEVSU0lTVEVOVF9TVE9SQUdFX1NRTElURSwgU291cENvb2tpZVBlcnNpc3RlbnRTdG9y YWdlU1FMaXRlKTsKK3ZvaWQgRXdrX0Nvb2tpZV9NYW5hZ2VyOjpnZXRIVFRQQWNjZXB0UG9saWN5 KFdLQ29va2llTWFuYWdlckdldEhUVFBDb29raWVBY2NlcHRQb2xpY3lGdW5jdGlvbiBjYWxsYmFj aywgdm9pZCogdXNlckRhdGEpIGNvbnN0Cit7CisgICAgV0tDb29raWVNYW5hZ2VyR2V0SFRUUENv b2tpZUFjY2VwdFBvbGljeShtX3drQ29va2llTWFuYWdlci5nZXQoKSwgdXNlckRhdGEsIGNhbGxi YWNrKTsKK30KIAotc3RhdGljIHZvaWQgY29va2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJS ZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Y29v a2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p CiB7CiAgICAgRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyID0gc3RhdGljX2Nhc3Q8RXdrX0Nv b2tpZV9NYW5hZ2VyKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpOwogCi0gICAgaWYg KCFtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKQorICAgIGlmICghbWFuYWdlci0+aXNX YXRjaGluZ0ZvckNoYW5nZXMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbWFuYWdlci0+Y2hh bmdlSGFuZGxlci5jYWxsYmFjayhtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLnVzZXJEYXRhKTsKKyAg ICBtYW5hZ2VyLT5tX2NoYW5nZUhhbmRsZXIuY2FsbGJhY2sobWFuYWdlci0+bV9jaGFuZ2VIYW5k bGVyLnVzZXJEYXRhKTsKIH0KIAorLy8gRXdrX0Nvb2tpZV9QZXJzaXN0ZW50X1N0b3JhZ2UgZW51 bSB2YWxpZGF0aW9uLgorQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lFX1BF UlNJU1RFTlRfU1RPUkFHRV9URVhULCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUZXh0KTsK K0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9QRVJTSVNURU5UX1NUT1JB R0VfU1FMSVRFLCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VTUUxpdGUpOworCiB2b2lkIGV3 a19jb29raWVfbWFuYWdlcl9wZXJzaXN0ZW50X3N0b3JhZ2Vfc2V0KEV3a19Db29raWVfTWFuYWdl ciogbWFuYWdlciwgY29uc3QgY2hhciogZmlsZW5hbWUsIEV3a19Db29raWVfUGVyc2lzdGVudF9T dG9yYWdlIHN0b3JhZ2UpCiB7Ci0gICAgRVdLX0NPT0tJRV9NQU5BR0VSX1dLX0dFVF9PUl9SRVRV Uk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTiht YW5hZ2VyKTsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihmaWxlbmFtZSk7CiAKLSAg ICBpZiAobWFuYWdlci0+Y2hhbmdlSGFuZGxlci5jYWxsYmFjaykKLSAgICAgICAgV0tDb29raWVN YW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMod2tNYW5hZ2VyKTsKLQotICAgIHRvSW1w bCh3a01hbmFnZXIpLT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShTdHJpbmc6OmZyb21VVEY4 KGZpbGVuYW1lKSwgc3RvcmFnZSk7Ci0KLSAgICBpZiAobWFuYWdlci0+Y2hhbmdlSGFuZGxlci5j YWxsYmFjaykKLSAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVDaGFu Z2VzKHdrTWFuYWdlcik7CisgICAgbWFuYWdlci0+c2V0UGVyc2lzdGVudFN0b3JhZ2UoU3RyaW5n Ojpmcm9tVVRGOChmaWxlbmFtZSksIHN0YXRpY19jYXN0PFNvdXBDb29raWVQZXJzaXN0ZW50U3Rv cmFnZVR5cGU+KHN0b3JhZ2UpKTsKIH0KIAorLy8gRXdrX0Nvb2tpZV9BY2NlcHRfUG9saWN5IGVu dW0gdmFsaWRhdGlvbi4KK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9B Q0NFUFRfUE9MSUNZX0FMV0FZUywga1dLSFRUUENvb2tpZUFjY2VwdFBvbGljeUFsd2F5cyk7CitD T01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT09LSUVfQUNDRVBUX1BPTElDWV9ORVZF Uiwga1dLSFRUUENvb2tpZUFjY2VwdFBvbGljeU5ldmVyKTsKK0NPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oRVdLX0NPT0tJRV9BQ0NFUFRfUE9MSUNZX05PX1RISVJEX1BBUlRZLCBrV0tIVFRQ Q29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4pOworCiB2b2lkIGV3 a19jb29raWVfbWFuYWdlcl9hY2NlcHRfcG9saWN5X3NldChFd2tfQ29va2llX01hbmFnZXIqIG1h bmFnZXIsIEV3a19Db29raWVfQWNjZXB0X1BvbGljeSBwb2xpY3kpCiB7Ci0gICAgRVdLX0NPT0tJ RV9NQU5BR0VSX1dLX0dFVF9PUl9SRVRVUk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKKyAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTihtYW5hZ2VyKTsKIAotICAgIFdLQ29va2llTWFuYWdlclNl dEhUVFBDb29raWVBY2NlcHRQb2xpY3kod2tNYW5hZ2VyLCBzdGF0aWNfY2FzdDxXS0hUVFBDb29r aWVBY2NlcHRQb2xpY3k+KHBvbGljeSkpOworICAgIG1hbmFnZXItPnNldEhUVFBBY2NlcHRQb2xp Y3koc3RhdGljX2Nhc3Q8V0tIVFRQQ29va2llQWNjZXB0UG9saWN5Pihwb2xpY3kpKTsKIH0KIAog c3RydWN0IEdldF9Qb2xpY3lfQXN5bmNfRGF0YSB7CiAgICAgRXdrX0Nvb2tpZV9NYW5hZ2VyX0Fz eW5jX1BvbGljeV9HZXRfQ2IgY2FsbGJhY2s7CiAgICAgdm9pZCogdXNlckRhdGE7CisKKyAgICBH ZXRfUG9saWN5X0FzeW5jX0RhdGEoRXdrX0Nvb2tpZV9NYW5hZ2VyX0FzeW5jX1BvbGljeV9HZXRf Q2IgY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKQorICAgICAgICA6IGNhbGxiYWNrKGNhbGxiYWNr KQorICAgICAgICAsIHVzZXJEYXRhKHVzZXJEYXRhKQorICAgIHsgfQogfTsKIAogc3RhdGljIHZv aWQgZ2V0QWNjZXB0UG9saWN5Q2FsbGJhY2soV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGlj eSwgV0tFcnJvclJlZiB3a0Vycm9yLCB2b2lkKiBkYXRhKQpAQCAtMTI3LDE5ICsxNjQsMjEgQEAg c3RhdGljIHZvaWQgZ2V0QWNjZXB0UG9saWN5Q2FsbGJhY2soV0tIVFRQQ29va2llQWNjZXB0UG9s aWN5IHBvbGljeSwgV0tFcnJvclJlZgogCiB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9hc3luY19h Y2NlcHRfcG9saWN5X2dldChjb25zdCBFd2tfQ29va2llX01hbmFnZXIqIG1hbmFnZXIsIEV3a19D b29raWVfTWFuYWdlcl9Bc3luY19Qb2xpY3lfR2V0X0NiIGNhbGxiYWNrLCB2b2lkKiBkYXRhKQog ewotICAgIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFnZXIsIHdrTWFu YWdlcik7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4obWFuYWdlcik7CiAgICAgRUlO QV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oY2FsbGJhY2spOwogCi0gICAgR2V0X1BvbGljeV9Bc3lu Y19EYXRhKiBjYWxsYmFja0RhdGEgPSBuZXcgR2V0X1BvbGljeV9Bc3luY19EYXRhOwotICAgIGNh bGxiYWNrRGF0YS0+Y2FsbGJhY2sgPSBjYWxsYmFjazsKLSAgICBjYWxsYmFja0RhdGEtPnVzZXJE YXRhID0gZGF0YTsKLQotICAgIFdLQ29va2llTWFuYWdlckdldEhUVFBDb29raWVBY2NlcHRQb2xp Y3kod2tNYW5hZ2VyLCBjYWxsYmFja0RhdGEsIGdldEFjY2VwdFBvbGljeUNhbGxiYWNrKTsKKyAg ICBHZXRfUG9saWN5X0FzeW5jX0RhdGEqIGNhbGxiYWNrRGF0YSA9IG5ldyBHZXRfUG9saWN5X0Fz eW5jX0RhdGEoY2FsbGJhY2ssIGRhdGEpOworICAgIG1hbmFnZXItPmdldEhUVFBBY2NlcHRQb2xp Y3koZ2V0QWNjZXB0UG9saWN5Q2FsbGJhY2ssIGNhbGxiYWNrRGF0YSk7CiB9CiAKIHN0cnVjdCBH ZXRfSG9zdG5hbWVzX0FzeW5jX0RhdGEgewogICAgIEV3a19Db29raWVfTWFuYWdlcl9Bc3luY19I b3N0bmFtZXNfR2V0X0NiIGNhbGxiYWNrOwogICAgIHZvaWQqIHVzZXJEYXRhOworCisgICAgR2V0 X0hvc3RuYW1lc19Bc3luY19EYXRhKEV3a19Db29raWVfTWFuYWdlcl9Bc3luY19Ib3N0bmFtZXNf R2V0X0NiIGNhbGxiYWNrLCB2b2lkKiB1c2VyRGF0YSkKKyAgICAgICAgOiBjYWxsYmFjayhjYWxs YmFjaykKKyAgICAgICAgLCB1c2VyRGF0YSh1c2VyRGF0YSkKKyAgICB7IH0KIH07CiAKIHN0YXRp YyB2b2lkIGdldEhvc3RuYW1lc1dpdGhDb29raWVzQ2FsbGJhY2soV0tBcnJheVJlZiB3a0hvc3Ru YW1lcywgV0tFcnJvclJlZiB3a0Vycm9yLCB2b2lkKiBjb250ZXh0KQpAQCAtMTY4LDQwICsyMDcs MzEgQEAgc3RhdGljIHZvaWQgZ2V0SG9zdG5hbWVzV2l0aENvb2tpZXNDYWxsYmFjayhXS0FycmF5 UmVmIHdrSG9zdG5hbWVzLCBXS0Vycm9yUmVmIHcKIAogdm9pZCBld2tfY29va2llX21hbmFnZXJf YXN5bmNfaG9zdG5hbWVzX3dpdGhfY29va2llc19nZXQoY29uc3QgRXdrX0Nvb2tpZV9NYW5hZ2Vy KiBtYW5hZ2VyLCBFd2tfQ29va2llX01hbmFnZXJfQXN5bmNfSG9zdG5hbWVzX0dldF9DYiBjYWxs YmFjaywgdm9pZCogZGF0YSkKIHsKLSAgICBFV0tfQ09PS0lFX01BTkFHRVJfV0tfR0VUX09SX1JF VFVSTihtYW5hZ2VyLCB3a01hbmFnZXIpOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJO KG1hbmFnZXIpOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNhbGxiYWNrKTsKIAot ICAgIEdldF9Ib3N0bmFtZXNfQXN5bmNfRGF0YSogY2FsbGJhY2tEYXRhID0gbmV3IEdldF9Ib3N0 bmFtZXNfQXN5bmNfRGF0YTsKLSAgICBjYWxsYmFja0RhdGEtPmNhbGxiYWNrID0gY2FsbGJhY2s7 Ci0gICAgY2FsbGJhY2tEYXRhLT51c2VyRGF0YSA9IGRhdGE7Ci0KLSAgICBXS0Nvb2tpZU1hbmFn ZXJHZXRIb3N0bmFtZXNXaXRoQ29va2llcyh3a01hbmFnZXIsIGNhbGxiYWNrRGF0YSwgZ2V0SG9z dG5hbWVzV2l0aENvb2tpZXNDYWxsYmFjayk7CisgICAgR2V0X0hvc3RuYW1lc19Bc3luY19EYXRh KiBjYWxsYmFja0RhdGEgPSBuZXcgR2V0X0hvc3RuYW1lc19Bc3luY19EYXRhKGNhbGxiYWNrLCBk YXRhKTsKKyAgICBtYW5hZ2VyLT5nZXRIb3N0TmFtZXNXaXRoQ29va2llcyhnZXRIb3N0bmFtZXNX aXRoQ29va2llc0NhbGxiYWNrLCBjYWxsYmFja0RhdGEpOwogfQogCi12b2lkIGV3a19jb29raWVf bWFuYWdlcl9ob3N0bmFtZV9jb29raWVzX2NsZWFyKEV3a19Db29raWVfTWFuYWdlciogbWFuYWdl ciwgY29uc3QgY2hhciogaG9zdE5hbWUpCit2b2lkIGV3a19jb29raWVfbWFuYWdlcl9ob3N0bmFt ZV9jb29raWVzX2NsZWFyKEV3a19Db29raWVfTWFuYWdlciogbWFuYWdlciwgY29uc3QgY2hhciog aG9zdG5hbWUpCiB7Ci0gICAgRVdLX0NPT0tJRV9NQU5BR0VSX1dLX0dFVF9PUl9SRVRVUk4obWFu YWdlciwgd2tNYW5hZ2VyKTsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihob3N0TmFt ZSk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4obWFuYWdlcik7CisgICAgRUlOQV9T QUZFVFlfT05fTlVMTF9SRVRVUk4oaG9zdG5hbWUpOwogCi0gICAgV0tSZXRhaW5QdHI8V0tTdHJp bmdSZWY+IHdrSG9zdE5hbWUoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmco aG9zdE5hbWUpKTsKLSAgICBXS0Nvb2tpZU1hbmFnZXJEZWxldGVDb29raWVzRm9ySG9zdG5hbWUo d2tNYW5hZ2VyLCB3a0hvc3ROYW1lLmdldCgpKTsKKyAgICBtYW5hZ2VyLT5jbGVhckhvc3RuYW1l Q29va2llcyhTdHJpbmc6OmZyb21VVEY4KGhvc3RuYW1lKSk7CiB9CiAKIHZvaWQgZXdrX2Nvb2tp ZV9tYW5hZ2VyX2Nvb2tpZXNfY2xlYXIoRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyKQogewot ICAgIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFnZXIsIHdrTWFuYWdl cik7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4obWFuYWdlcik7CiAKLSAgICBXS0Nv b2tpZU1hbmFnZXJEZWxldGVBbGxDb29raWVzKHdrTWFuYWdlcik7CisgICAgbWFuYWdlci0+Y2xl YXJBbGxDb29raWVzKCk7CiB9CiAKIHZvaWQgZXdrX2Nvb2tpZV9tYW5hZ2VyX2NoYW5nZXNfd2F0 Y2goRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyLCBFd2tfQ29va2llX01hbmFnZXJfQ2hhbmdl c19XYXRjaF9DYiBjYWxsYmFjaywgdm9pZCogZGF0YSkKIHsKLSAgICBFV0tfQ09PS0lFX01BTkFH RVJfV0tfR0VUX09SX1JFVFVSTihtYW5hZ2VyLCB3a01hbmFnZXIpOworICAgIEVJTkFfU0FGRVRZ X09OX05VTExfUkVUVVJOKG1hbmFnZXIpOwogCi0gICAgbWFuYWdlci0+Y2hhbmdlSGFuZGxlciA9 IENvb2tpZV9DaGFuZ2VfSGFuZGxlcihjYWxsYmFjaywgZGF0YSk7Ci0KLSAgICBpZiAoY2FsbGJh Y2spCi0gICAgICAgIFdLQ29va2llTWFuYWdlclN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hhbmdlcyh3 a01hbmFnZXIpOwotICAgIGVsc2UKLSAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2Vydmlu Z0Nvb2tpZUNoYW5nZXMod2tNYW5hZ2VyKTsKKyAgICBtYW5hZ2VyLT53YXRjaENoYW5nZXMoQ29v a2llX0NoYW5nZV9IYW5kbGVyKGNhbGxiYWNrLCBkYXRhKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3By aXZhdGUuaAppbmRleCBiNzU3OWFhLi44YzMyZjg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlcl9wcml2YXRl LmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGVf aAogI2RlZmluZSBld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZV9oCiAKKyNpbmNsdWRlICJTb3Vw Q29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlLmgiCiAjaW5jbHVkZSAiV0tDb29raWVNYW5hZ2Vy LmgiCiAjaW5jbHVkZSAiV0tSZXRhaW5QdHIuaCIKICNpbmNsdWRlICJld2tfY29va2llX21hbmFn ZXIuaCIKQEAgLTQ5LDkgKzUwLDYgQEAgc3RydWN0IENvb2tpZV9DaGFuZ2VfSGFuZGxlciB7CiAK IGNsYXNzIEV3a19Db29raWVfTWFuYWdlciB7CiBwdWJsaWM6Ci0gICAgV0tSZXRhaW5QdHI8V0tD b29raWVNYW5hZ2VyUmVmPiB3a0Nvb2tpZU1hbmFnZXI7Ci0gICAgQ29va2llX0NoYW5nZV9IYW5k bGVyIGNoYW5nZUhhbmRsZXI7Ci0KICAgICBzdGF0aWMgUGFzc093blB0cjxFd2tfQ29va2llX01h bmFnZXI+IGNyZWF0ZShXS0Nvb2tpZU1hbmFnZXJSZWYgY29va2llTWFuYWdlclJlZikKICAgICB7 CiAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrX0Nvb2tpZV9NYW5hZ2VyKGNvb2tpZU1h bmFnZXJSZWYpKTsKQEAgLTU5LDggKzU3LDI2IEBAIHB1YmxpYzoKIAogICAgIH5Fd2tfQ29va2ll X01hbmFnZXIoKTsKIAorICAgIHZvaWQgc2V0UGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgU3RyaW5n JiBmaWxlbmFtZSwgV2ViS2l0OjpTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlIHN0b3Jh Z2UpOworCisgICAgdm9pZCBnZXRIVFRQQWNjZXB0UG9saWN5KFdLQ29va2llTWFuYWdlckdldEhU VFBDb29raWVBY2NlcHRQb2xpY3lGdW5jdGlvbiBjYWxsYmFjaywgdm9pZCogdXNlckRhdGEpIGNv bnN0OworICAgIHZvaWQgc2V0SFRUUEFjY2VwdFBvbGljeShXS0hUVFBDb29raWVBY2NlcHRQb2xp Y3kgcG9saWN5KTsKKworICAgIHZvaWQgY2xlYXJIb3N0bmFtZUNvb2tpZXMoY29uc3QgU3RyaW5n JiBob3N0bmFtZSk7CisgICAgdm9pZCBjbGVhckFsbENvb2tpZXMoKTsKKworICAgIHZvaWQgZ2V0 SG9zdE5hbWVzV2l0aENvb2tpZXMoV0tDb29raWVNYW5hZ2VyR2V0Q29va2llSG9zdG5hbWVzRnVu Y3Rpb24gY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKSBjb25zdDsKKyAgICB2b2lkIHdhdGNoQ2hh bmdlcyhjb25zdCBDb29raWVfQ2hhbmdlX0hhbmRsZXImIGNoYW5nZUhhbmRsZXIpOworCiBwcml2 YXRlOgogICAgIGV4cGxpY2l0IEV3a19Db29raWVfTWFuYWdlcihXS0Nvb2tpZU1hbmFnZXJSZWYg Y29va2llTWFuYWdlclJlZik7CisKKyAgICBib29sIGlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkgY29u c3Q7CisKKyAgICBzdGF0aWMgdm9pZCBjb29raWVzRGlkQ2hhbmdlKFdLQ29va2llTWFuYWdlclJl ZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CisKKyAgICBXS1JldGFpblB0cjxXS0Nvb2tpZU1h bmFnZXJSZWY+IG1fd2tDb29raWVNYW5hZ2VyOworICAgIENvb2tpZV9DaGFuZ2VfSGFuZGxlciBt X2NoYW5nZUhhbmRsZXI7CiB9OwogCiAjZW5kaWYgLy8gZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZh dGVfaAo= 169801 2012-10-21 07:53:33 -0700 2012-10-21 09:00:39 -0700 Patch for landing 99930_cookieManager_cpp.patch text/plain 14381 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3M2NjMmNlLi4zNzczNTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDAg QEAKIDIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrX0Nvb2tpZV9NYW5hZ2VyIG1lbWJl cnMgcHJpdmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk5MzAKKworICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNl bi4KKworICAgICAgICBNYWtlIEV3a19Db29raWVfTWFuYWdlciBjbGFzcyBtZW1iZXJzIHByaXZh dGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuY3Bw OgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjpFd2tfQ29va2llX01hbmFnZXIpOgorICAg ICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjp+RXdrX0Nvb2tpZV9NYW5hZ2VyKToKKyAgICAgICAg KEV3a19Db29raWVfTWFuYWdlcjo6c2V0UGVyc2lzdGVudFN0b3JhZ2UpOgorICAgICAgICAoRXdr X0Nvb2tpZV9NYW5hZ2VyOjpzZXRIVFRQQWNjZXB0UG9saWN5KToKKyAgICAgICAgKEV3a19Db29r aWVfTWFuYWdlcjo6Y2xlYXJIb3N0bmFtZUNvb2tpZXMpOgorICAgICAgICAoRXdrX0Nvb2tpZV9N YW5hZ2VyOjpjbGVhckFsbENvb2tpZXMpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjp3 YXRjaENoYW5nZXMpOgorICAgICAgICAoRXdrX0Nvb2tpZV9NYW5hZ2VyOjppc1dhdGNoaW5nRm9y Q2hhbmdlcyk6CisgICAgICAgIChFd2tfQ29va2llX01hbmFnZXI6OmdldEhvc3ROYW1lc1dpdGhD b29raWVzKToKKyAgICAgICAgKEV3a19Db29raWVfTWFuYWdlcjo6Z2V0SFRUUEFjY2VwdFBvbGlj eSk6CisgICAgICAgIChFd2tfQ29va2llX01hbmFnZXI6OmNvb2tpZXNEaWRDaGFuZ2UpOgorICAg ICAgICAoZXdrX2Nvb2tpZV9tYW5hZ2VyX3BlcnNpc3RlbnRfc3RvcmFnZV9zZXQpOgorICAgICAg ICAoZXdrX2Nvb2tpZV9tYW5hZ2VyX2FjY2VwdF9wb2xpY3lfc2V0KToKKyAgICAgICAgKEdldF9Q b2xpY3lfQXN5bmNfRGF0YSk6CisgICAgICAgIChHZXRfUG9saWN5X0FzeW5jX0RhdGE6OkdldF9Q b2xpY3lfQXN5bmNfRGF0YSk6CisgICAgICAgIChld2tfY29va2llX21hbmFnZXJfYXN5bmNfYWNj ZXB0X3BvbGljeV9nZXQpOgorICAgICAgICAoR2V0X0hvc3RuYW1lc19Bc3luY19EYXRhKToKKyAg ICAgICAgKEdldF9Ib3N0bmFtZXNfQXN5bmNfRGF0YTo6R2V0X0hvc3RuYW1lc19Bc3luY19EYXRh KToKKyAgICAgICAgKGV3a19jb29raWVfbWFuYWdlcl9hc3luY19ob3N0bmFtZXNfd2l0aF9jb29r aWVzX2dldCk6CisgICAgICAgIChld2tfY29va2llX21hbmFnZXJfaG9zdG5hbWVfY29va2llc19j bGVhcik6CisgICAgICAgIChld2tfY29va2llX21hbmFnZXJfY29va2llc19jbGVhcik6CisgICAg ICAgIChld2tfY29va2llX21hbmFnZXJfY2hhbmdlc193YXRjaCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a19D b29raWVfTWFuYWdlcik6CisKKzIwMTItMTAtMjEgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3Rv cGhlLmR1bWV6QGludGVsLmNvbT4KKwogICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrIGludGVu dCBjbGFzc2VzIG1lbWJlcnMgcHJpdmF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTk4MzIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAKaW5kZXggM2NiZjdmZS4uZDM3 ZGE2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nv b2tpZV9tYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfY29va2llX21hbmFnZXIuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmln LmgiCiAjaW5jbHVkZSAiZXdrX2Nvb2tpZV9tYW5hZ2VyLmgiCiAKLSNpbmNsdWRlICJTb3VwQ29v a2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlLmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCiAjaW5j bHVkZSAiV0tBcnJheS5oIgogI2luY2x1ZGUgIldLU3RyaW5nLmgiCkBAIC00MCw3OSArMzksMTE3 IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLXN0YXRpYyB2b2lkIGNvb2tpZXNEaWRD aGFuZ2UoV0tDb29raWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLQogRXdr X0Nvb2tpZV9NYW5hZ2VyOjpFd2tfQ29va2llX01hbmFnZXIoV0tDb29raWVNYW5hZ2VyUmVmIGNv b2tpZU1hbmFnZXJSZWYpCi0gICAgOiB3a0Nvb2tpZU1hbmFnZXIoY29va2llTWFuYWdlclJlZikK KyAgICA6IG1fd2tDb29raWVNYW5hZ2VyKGNvb2tpZU1hbmFnZXJSZWYpCiB7CiAgICAgV0tDb29r aWVNYW5hZ2VyQ2xpZW50IHdrQ29va2llTWFuYWdlckNsaWVudCA9IHsKICAgICAgICAga1dLQ29v a2llTWFuYWdlckNsaWVudEN1cnJlbnRWZXJzaW9uLAogICAgICAgICB0aGlzLCAvLyBjbGllbnRJ bmZvCiAgICAgICAgIGNvb2tpZXNEaWRDaGFuZ2UKICAgICB9OwotICAgIFdLQ29va2llTWFuYWdl clNldENsaWVudCh3a0Nvb2tpZU1hbmFnZXIuZ2V0KCksICZ3a0Nvb2tpZU1hbmFnZXJDbGllbnQp OworICAgIFdLQ29va2llTWFuYWdlclNldENsaWVudChtX3drQ29va2llTWFuYWdlci5nZXQoKSwg JndrQ29va2llTWFuYWdlckNsaWVudCk7CiB9CiAKIEV3a19Db29raWVfTWFuYWdlcjo6fkV3a19D b29raWVfTWFuYWdlcigpCiB7CisgICAgaWYgKGlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkpCisgICAg ICAgIFdLQ29va2llTWFuYWdlclN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVN YW5hZ2VyLmdldCgpKTsKK30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OnNldFBlcnNpc3Rl bnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIFNvdXBDb29raWVQZXJzaXN0ZW50U3Rv cmFnZVR5cGUgc3RvcmFnZSkKK3sKKyAgICBib29sIGlzV2F0Y2hpbmdDaGFuZ2VzID0gaXNXYXRj aGluZ0ZvckNoYW5nZXMoKTsKKyAgICBpZiAoaXNXYXRjaGluZ0NoYW5nZXMpCisgICAgICAgIFdL Q29va2llTWFuYWdlclN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2Vy LmdldCgpKTsKKworICAgIHRvSW1wbChtX3drQ29va2llTWFuYWdlci5nZXQoKSktPnNldENvb2tp ZVBlcnNpc3RlbnRTdG9yYWdlKGZpbGVuYW1lLCBzdG9yYWdlKTsKKworICAgIGlmIChpc1dhdGNo aW5nQ2hhbmdlcykKKyAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVD aGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsKK30KKwordm9pZCBFd2tfQ29va2llX01h bmFnZXI6OnNldEhUVFBBY2NlcHRQb2xpY3koV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGlj eSkKK3sKKyAgICBXS0Nvb2tpZU1hbmFnZXJTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KG1fd2tD b29raWVNYW5hZ2VyLmdldCgpLCBwb2xpY3kpOworfQorCit2b2lkIEV3a19Db29raWVfTWFuYWdl cjo6Y2xlYXJIb3N0bmFtZUNvb2tpZXMoY29uc3QgU3RyaW5nJiBob3N0bmFtZSkKK3sKKyAgICB0 b0ltcGwobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpLT5kZWxldGVDb29raWVzRm9ySG9zdG5hbWUo aG9zdG5hbWUpOworfQorCit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Y2xlYXJBbGxDb29raWVz KCkKK3sKKyAgICBXS0Nvb2tpZU1hbmFnZXJEZWxldGVBbGxDb29raWVzKG1fd2tDb29raWVNYW5h Z2VyLmdldCgpKTsKK30KKwordm9pZCBFd2tfQ29va2llX01hbmFnZXI6OndhdGNoQ2hhbmdlcyhj b25zdCBDb29raWVfQ2hhbmdlX0hhbmRsZXImIGNoYW5nZUhhbmRsZXIpCit7CisgICAgbV9jaGFu Z2VIYW5kbGVyID0gY2hhbmdlSGFuZGxlcjsKKwogICAgIGlmIChjaGFuZ2VIYW5kbGVyLmNhbGxi YWNrKQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcyh3 a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2Vy dmluZ0Nvb2tpZUNoYW5nZXMobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgIGVsc2UKKyAg ICAgICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMobV93a0Nvb2tp ZU1hbmFnZXIuZ2V0KCkpOwogfQogCi0jZGVmaW5lIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRf T1JfUkVUVVJOKG1hbmFnZXIsIHdrTWFuYWdlcl8sIC4uLikgICAgXAotICAgIGlmICghKG1hbmFn ZXIpKSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKLSAgICAgICAgRUlOQV9MT0dfQ1JJVCgibWFuYWdlciBpcyBOVUxMLiIpOyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIH0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKLSAgICBpZiAoIShtYW5hZ2VyKS0+d2tDb29raWVNYW5hZ2VyKSB7ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQoIm1hbmFnZXItPndr Q29va2llTWFuYWdlciBpcyBOVUxMLiIpOyAgICAgICAgICAgICAgXAotICAgICAgICByZXR1cm4g X19WQV9BUkdTX187ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKLSAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCi0gICAgV0tDb29raWVNYW5hZ2VyUmVmIHdrTWFuYWdlcl8g PSAobWFuYWdlciktPndrQ29va2llTWFuYWdlci5nZXQoKQorYm9vbCBFd2tfQ29va2llX01hbmFn ZXI6OmlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8Ym9vbD4obV9jaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKTsKK30KIAotLy8gRXdrX0Nvb2tpZV9B Y2NlcHRfUG9saWN5IGVudW0gdmFsaWRhdGlvbgotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfQUxXQVlTLCBrV0tIVFRQQ29va2llQWNjZXB0UG9s aWN5QWx3YXlzKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9BQ0NF UFRfUE9MSUNZX05FVkVSLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIpOwotQ09NUElM RV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfTk9fVEhJUkRf UEFSVFksIGtXS0hUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFp bik7Cit2b2lkIEV3a19Db29raWVfTWFuYWdlcjo6Z2V0SG9zdE5hbWVzV2l0aENvb2tpZXMoV0tD b29raWVNYW5hZ2VyR2V0Q29va2llSG9zdG5hbWVzRnVuY3Rpb24gY2FsbGJhY2ssIHZvaWQqIHVz ZXJEYXRhKSBjb25zdAoreworICAgIFdLQ29va2llTWFuYWdlckdldEhvc3RuYW1lc1dpdGhDb29r aWVzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpLCB1c2VyRGF0YSwgY2FsbGJhY2spOworfQogCi0v LyBFd2tfQ29va2llX1BlcnNpc3RlbnRfU3RvcmFnZSBlbnVtIHZhbGlkYXRpb24KLUNPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9QRVJTSVNURU5UX1NUT1JBR0VfVEVYVCwg U291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVGV4dCk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKEVXS19DT09LSUVfUEVSU0lTVEVOVF9TVE9SQUdFX1NRTElURSwgU291cENvb2tpZVBl cnNpc3RlbnRTdG9yYWdlU1FMaXRlKTsKK3ZvaWQgRXdrX0Nvb2tpZV9NYW5hZ2VyOjpnZXRIVFRQ QWNjZXB0UG9saWN5KFdLQ29va2llTWFuYWdlckdldEhUVFBDb29raWVBY2NlcHRQb2xpY3lGdW5j dGlvbiBjYWxsYmFjaywgdm9pZCogdXNlckRhdGEpIGNvbnN0Cit7CisgICAgV0tDb29raWVNYW5h Z2VyR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShtX3drQ29va2llTWFuYWdlci5nZXQoKSwgdXNl ckRhdGEsIGNhbGxiYWNrKTsKK30KIAotc3RhdGljIHZvaWQgY29va2llc0RpZENoYW5nZShXS0Nv b2tpZU1hbmFnZXJSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit2b2lkIEV3a19Db29raWVf TWFuYWdlcjo6Y29va2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJSZWYsIGNvbnN0IHZvaWQq IGNsaWVudEluZm8pCiB7CiAgICAgRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyID0gc3RhdGlj X2Nhc3Q8RXdrX0Nvb2tpZV9NYW5hZ2VyKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykp OwogCi0gICAgaWYgKCFtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKQorICAgIGlmICgh bWFuYWdlci0+aXNXYXRjaGluZ0ZvckNoYW5nZXMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg bWFuYWdlci0+Y2hhbmdlSGFuZGxlci5jYWxsYmFjayhtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyLnVz ZXJEYXRhKTsKKyAgICBtYW5hZ2VyLT5tX2NoYW5nZUhhbmRsZXIuY2FsbGJhY2sobWFuYWdlci0+ bV9jaGFuZ2VIYW5kbGVyLnVzZXJEYXRhKTsKIH0KIAorLy8gRXdrX0Nvb2tpZV9QZXJzaXN0ZW50 X1N0b3JhZ2UgZW51bSB2YWxpZGF0aW9uLgorQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShF V0tfQ09PS0lFX1BFUlNJU1RFTlRfU1RPUkFHRV9URVhULCBTb3VwQ29va2llUGVyc2lzdGVudFN0 b3JhZ2VUZXh0KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9QRVJT SVNURU5UX1NUT1JBR0VfU1FMSVRFLCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VTUUxpdGUp OworCiB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9wZXJzaXN0ZW50X3N0b3JhZ2Vfc2V0KEV3a19D b29raWVfTWFuYWdlciogbWFuYWdlciwgY29uc3QgY2hhciogZmlsZW5hbWUsIEV3a19Db29raWVf UGVyc2lzdGVudF9TdG9yYWdlIHN0b3JhZ2UpCiB7Ci0gICAgRVdLX0NPT0tJRV9NQU5BR0VSX1dL X0dFVF9PUl9SRVRVUk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9O VUxMX1JFVFVSTihtYW5hZ2VyKTsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihmaWxl bmFtZSk7CiAKLSAgICBpZiAobWFuYWdlci0+Y2hhbmdlSGFuZGxlci5jYWxsYmFjaykKLSAgICAg ICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMod2tNYW5hZ2VyKTsK LQotICAgIHRvSW1wbCh3a01hbmFnZXIpLT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShTdHJp bmc6OmZyb21VVEY4KGZpbGVuYW1lKSwgc3RvcmFnZSk7Ci0KLSAgICBpZiAobWFuYWdlci0+Y2hh bmdlSGFuZGxlci5jYWxsYmFjaykKLSAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZp bmdDb29raWVDaGFuZ2VzKHdrTWFuYWdlcik7CisgICAgbWFuYWdlci0+c2V0UGVyc2lzdGVudFN0 b3JhZ2UoU3RyaW5nOjpmcm9tVVRGOChmaWxlbmFtZSksIHN0YXRpY19jYXN0PFNvdXBDb29raWVQ ZXJzaXN0ZW50U3RvcmFnZVR5cGU+KHN0b3JhZ2UpKTsKIH0KIAorLy8gRXdrX0Nvb2tpZV9BY2Nl cHRfUG9saWN5IGVudW0gdmFsaWRhdGlvbi4KK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0o RVdLX0NPT0tJRV9BQ0NFUFRfUE9MSUNZX0FMV0FZUywga1dLSFRUUENvb2tpZUFjY2VwdFBvbGlj eUFsd2F5cyk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT09LSUVfQUNDRVBU X1BPTElDWV9ORVZFUiwga1dLSFRUUENvb2tpZUFjY2VwdFBvbGljeU5ldmVyKTsKK0NPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9BQ0NFUFRfUE9MSUNZX05PX1RISVJEX1BB UlRZLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4p OworCiB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9hY2NlcHRfcG9saWN5X3NldChFd2tfQ29va2ll X01hbmFnZXIqIG1hbmFnZXIsIEV3a19Db29raWVfQWNjZXB0X1BvbGljeSBwb2xpY3kpCiB7Ci0g ICAgRVdLX0NPT0tJRV9NQU5BR0VSX1dLX0dFVF9PUl9SRVRVUk4obWFuYWdlciwgd2tNYW5hZ2Vy KTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihtYW5hZ2VyKTsKIAotICAgIFdLQ29v a2llTWFuYWdlclNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kod2tNYW5hZ2VyLCBzdGF0aWNfY2Fz dDxXS0hUVFBDb29raWVBY2NlcHRQb2xpY3k+KHBvbGljeSkpOworICAgIG1hbmFnZXItPnNldEhU VFBBY2NlcHRQb2xpY3koc3RhdGljX2Nhc3Q8V0tIVFRQQ29va2llQWNjZXB0UG9saWN5Pihwb2xp Y3kpKTsKIH0KIAogc3RydWN0IEdldF9Qb2xpY3lfQXN5bmNfRGF0YSB7CiAgICAgRXdrX0Nvb2tp ZV9NYW5hZ2VyX0FzeW5jX1BvbGljeV9HZXRfQ2IgY2FsbGJhY2s7CiAgICAgdm9pZCogdXNlckRh dGE7CisKKyAgICBHZXRfUG9saWN5X0FzeW5jX0RhdGEoRXdrX0Nvb2tpZV9NYW5hZ2VyX0FzeW5j X1BvbGljeV9HZXRfQ2IgY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKQorICAgICAgICA6IGNhbGxi YWNrKGNhbGxiYWNrKQorICAgICAgICAsIHVzZXJEYXRhKHVzZXJEYXRhKQorICAgIHsgfQogfTsK IAogc3RhdGljIHZvaWQgZ2V0QWNjZXB0UG9saWN5Q2FsbGJhY2soV0tIVFRQQ29va2llQWNjZXB0 UG9saWN5IHBvbGljeSwgV0tFcnJvclJlZiB3a0Vycm9yLCB2b2lkKiBkYXRhKQpAQCAtMTI3LDE5 ICsxNjQsMjEgQEAgc3RhdGljIHZvaWQgZ2V0QWNjZXB0UG9saWN5Q2FsbGJhY2soV0tIVFRQQ29v a2llQWNjZXB0UG9saWN5IHBvbGljeSwgV0tFcnJvclJlZgogCiB2b2lkIGV3a19jb29raWVfbWFu YWdlcl9hc3luY19hY2NlcHRfcG9saWN5X2dldChjb25zdCBFd2tfQ29va2llX01hbmFnZXIqIG1h bmFnZXIsIEV3a19Db29raWVfTWFuYWdlcl9Bc3luY19Qb2xpY3lfR2V0X0NiIGNhbGxiYWNrLCB2 b2lkKiBkYXRhKQogewotICAgIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1h bmFnZXIsIHdrTWFuYWdlcik7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4obWFuYWdl cik7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oY2FsbGJhY2spOwogCi0gICAgR2V0 X1BvbGljeV9Bc3luY19EYXRhKiBjYWxsYmFja0RhdGEgPSBuZXcgR2V0X1BvbGljeV9Bc3luY19E YXRhOwotICAgIGNhbGxiYWNrRGF0YS0+Y2FsbGJhY2sgPSBjYWxsYmFjazsKLSAgICBjYWxsYmFj a0RhdGEtPnVzZXJEYXRhID0gZGF0YTsKLQotICAgIFdLQ29va2llTWFuYWdlckdldEhUVFBDb29r aWVBY2NlcHRQb2xpY3kod2tNYW5hZ2VyLCBjYWxsYmFja0RhdGEsIGdldEFjY2VwdFBvbGljeUNh bGxiYWNrKTsKKyAgICBHZXRfUG9saWN5X0FzeW5jX0RhdGEqIGNhbGxiYWNrRGF0YSA9IG5ldyBH ZXRfUG9saWN5X0FzeW5jX0RhdGEoY2FsbGJhY2ssIGRhdGEpOworICAgIG1hbmFnZXItPmdldEhU VFBBY2NlcHRQb2xpY3koZ2V0QWNjZXB0UG9saWN5Q2FsbGJhY2ssIGNhbGxiYWNrRGF0YSk7CiB9 CiAKIHN0cnVjdCBHZXRfSG9zdG5hbWVzX0FzeW5jX0RhdGEgewogICAgIEV3a19Db29raWVfTWFu YWdlcl9Bc3luY19Ib3N0bmFtZXNfR2V0X0NiIGNhbGxiYWNrOwogICAgIHZvaWQqIHVzZXJEYXRh OworCisgICAgR2V0X0hvc3RuYW1lc19Bc3luY19EYXRhKEV3a19Db29raWVfTWFuYWdlcl9Bc3lu Y19Ib3N0bmFtZXNfR2V0X0NiIGNhbGxiYWNrLCB2b2lkKiB1c2VyRGF0YSkKKyAgICAgICAgOiBj YWxsYmFjayhjYWxsYmFjaykKKyAgICAgICAgLCB1c2VyRGF0YSh1c2VyRGF0YSkKKyAgICB7IH0K IH07CiAKIHN0YXRpYyB2b2lkIGdldEhvc3RuYW1lc1dpdGhDb29raWVzQ2FsbGJhY2soV0tBcnJh eVJlZiB3a0hvc3RuYW1lcywgV0tFcnJvclJlZiB3a0Vycm9yLCB2b2lkKiBjb250ZXh0KQpAQCAt MTY4LDQwICsyMDcsMzEgQEAgc3RhdGljIHZvaWQgZ2V0SG9zdG5hbWVzV2l0aENvb2tpZXNDYWxs YmFjayhXS0FycmF5UmVmIHdrSG9zdG5hbWVzLCBXS0Vycm9yUmVmIHcKIAogdm9pZCBld2tfY29v a2llX21hbmFnZXJfYXN5bmNfaG9zdG5hbWVzX3dpdGhfY29va2llc19nZXQoY29uc3QgRXdrX0Nv b2tpZV9NYW5hZ2VyKiBtYW5hZ2VyLCBFd2tfQ29va2llX01hbmFnZXJfQXN5bmNfSG9zdG5hbWVz X0dldF9DYiBjYWxsYmFjaywgdm9pZCogZGF0YSkKIHsKLSAgICBFV0tfQ09PS0lFX01BTkFHRVJf V0tfR0VUX09SX1JFVFVSTihtYW5hZ2VyLCB3a01hbmFnZXIpOworICAgIEVJTkFfU0FGRVRZX09O X05VTExfUkVUVVJOKG1hbmFnZXIpOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNh bGxiYWNrKTsKIAotICAgIEdldF9Ib3N0bmFtZXNfQXN5bmNfRGF0YSogY2FsbGJhY2tEYXRhID0g bmV3IEdldF9Ib3N0bmFtZXNfQXN5bmNfRGF0YTsKLSAgICBjYWxsYmFja0RhdGEtPmNhbGxiYWNr ID0gY2FsbGJhY2s7Ci0gICAgY2FsbGJhY2tEYXRhLT51c2VyRGF0YSA9IGRhdGE7Ci0KLSAgICBX S0Nvb2tpZU1hbmFnZXJHZXRIb3N0bmFtZXNXaXRoQ29va2llcyh3a01hbmFnZXIsIGNhbGxiYWNr RGF0YSwgZ2V0SG9zdG5hbWVzV2l0aENvb2tpZXNDYWxsYmFjayk7CisgICAgR2V0X0hvc3RuYW1l c19Bc3luY19EYXRhKiBjYWxsYmFja0RhdGEgPSBuZXcgR2V0X0hvc3RuYW1lc19Bc3luY19EYXRh KGNhbGxiYWNrLCBkYXRhKTsKKyAgICBtYW5hZ2VyLT5nZXRIb3N0TmFtZXNXaXRoQ29va2llcyhn ZXRIb3N0bmFtZXNXaXRoQ29va2llc0NhbGxiYWNrLCBjYWxsYmFja0RhdGEpOwogfQogCi12b2lk IGV3a19jb29raWVfbWFuYWdlcl9ob3N0bmFtZV9jb29raWVzX2NsZWFyKEV3a19Db29raWVfTWFu YWdlciogbWFuYWdlciwgY29uc3QgY2hhciogaG9zdE5hbWUpCit2b2lkIGV3a19jb29raWVfbWFu YWdlcl9ob3N0bmFtZV9jb29raWVzX2NsZWFyKEV3a19Db29raWVfTWFuYWdlciogbWFuYWdlciwg Y29uc3QgY2hhciogaG9zdG5hbWUpCiB7Ci0gICAgRVdLX0NPT0tJRV9NQU5BR0VSX1dLX0dFVF9P Ul9SRVRVUk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTihob3N0TmFtZSk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4obWFuYWdlcik7 CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oaG9zdG5hbWUpOwogCi0gICAgV0tSZXRh aW5QdHI8V0tTdHJpbmdSZWY+IHdrSG9zdE5hbWUoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRo VVRGOENTdHJpbmcoaG9zdE5hbWUpKTsKLSAgICBXS0Nvb2tpZU1hbmFnZXJEZWxldGVDb29raWVz Rm9ySG9zdG5hbWUod2tNYW5hZ2VyLCB3a0hvc3ROYW1lLmdldCgpKTsKKyAgICBtYW5hZ2VyLT5j bGVhckhvc3RuYW1lQ29va2llcyhTdHJpbmc6OmZyb21VVEY4KGhvc3RuYW1lKSk7CiB9CiAKIHZv aWQgZXdrX2Nvb2tpZV9tYW5hZ2VyX2Nvb2tpZXNfY2xlYXIoRXdrX0Nvb2tpZV9NYW5hZ2VyKiBt YW5hZ2VyKQogewotICAgIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFn ZXIsIHdrTWFuYWdlcik7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4obWFuYWdlcik7 CiAKLSAgICBXS0Nvb2tpZU1hbmFnZXJEZWxldGVBbGxDb29raWVzKHdrTWFuYWdlcik7CisgICAg bWFuYWdlci0+Y2xlYXJBbGxDb29raWVzKCk7CiB9CiAKIHZvaWQgZXdrX2Nvb2tpZV9tYW5hZ2Vy X2NoYW5nZXNfd2F0Y2goRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyLCBFd2tfQ29va2llX01h bmFnZXJfQ2hhbmdlc19XYXRjaF9DYiBjYWxsYmFjaywgdm9pZCogZGF0YSkKIHsKLSAgICBFV0tf Q09PS0lFX01BTkFHRVJfV0tfR0VUX09SX1JFVFVSTihtYW5hZ2VyLCB3a01hbmFnZXIpOworICAg IEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKG1hbmFnZXIpOwogCi0gICAgbWFuYWdlci0+Y2hh bmdlSGFuZGxlciA9IENvb2tpZV9DaGFuZ2VfSGFuZGxlcihjYWxsYmFjaywgZGF0YSk7Ci0KLSAg ICBpZiAoY2FsbGJhY2spCi0gICAgICAgIFdLQ29va2llTWFuYWdlclN0YXJ0T2JzZXJ2aW5nQ29v a2llQ2hhbmdlcyh3a01hbmFnZXIpOwotICAgIGVsc2UKLSAgICAgICAgV0tDb29raWVNYW5hZ2Vy U3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMod2tNYW5hZ2VyKTsKKyAgICBtYW5hZ2VyLT53YXRj aENoYW5nZXMoQ29va2llX0NoYW5nZV9IYW5kbGVyKGNhbGxiYWNrLCBkYXRhKSk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFn ZXJfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tp ZV9tYW5hZ2VyX3ByaXZhdGUuaAppbmRleCBiNzU3OWFhLi44YzMyZjg5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0 ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFu YWdlcl9wcml2YXRlLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgZXdrX2Nvb2tpZV9tYW5h Z2VyX3ByaXZhdGVfaAogI2RlZmluZSBld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZV9oCiAKKyNp bmNsdWRlICJTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlLmgiCiAjaW5jbHVkZSAiV0tD b29raWVNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiV0tSZXRhaW5QdHIuaCIKICNpbmNsdWRlICJld2tf Y29va2llX21hbmFnZXIuaCIKQEAgLTQ5LDkgKzUwLDYgQEAgc3RydWN0IENvb2tpZV9DaGFuZ2Vf SGFuZGxlciB7CiAKIGNsYXNzIEV3a19Db29raWVfTWFuYWdlciB7CiBwdWJsaWM6Ci0gICAgV0tS ZXRhaW5QdHI8V0tDb29raWVNYW5hZ2VyUmVmPiB3a0Nvb2tpZU1hbmFnZXI7Ci0gICAgQ29va2ll X0NoYW5nZV9IYW5kbGVyIGNoYW5nZUhhbmRsZXI7Ci0KICAgICBzdGF0aWMgUGFzc093blB0cjxF d2tfQ29va2llX01hbmFnZXI+IGNyZWF0ZShXS0Nvb2tpZU1hbmFnZXJSZWYgY29va2llTWFuYWdl clJlZikKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrX0Nvb2tpZV9NYW5h Z2VyKGNvb2tpZU1hbmFnZXJSZWYpKTsKQEAgLTU5LDggKzU3LDI2IEBAIHB1YmxpYzoKIAogICAg IH5Fd2tfQ29va2llX01hbmFnZXIoKTsKIAorICAgIHZvaWQgc2V0UGVyc2lzdGVudFN0b3JhZ2Uo Y29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgV2ViS2l0OjpTb3VwQ29va2llUGVyc2lzdGVudFN0b3Jh Z2VUeXBlIHN0b3JhZ2UpOworCisgICAgdm9pZCBnZXRIVFRQQWNjZXB0UG9saWN5KFdLQ29va2ll TWFuYWdlckdldEhUVFBDb29raWVBY2NlcHRQb2xpY3lGdW5jdGlvbiBjYWxsYmFjaywgdm9pZCog dXNlckRhdGEpIGNvbnN0OworICAgIHZvaWQgc2V0SFRUUEFjY2VwdFBvbGljeShXS0hUVFBDb29r aWVBY2NlcHRQb2xpY3kgcG9saWN5KTsKKworICAgIHZvaWQgY2xlYXJIb3N0bmFtZUNvb2tpZXMo Y29uc3QgU3RyaW5nJiBob3N0bmFtZSk7CisgICAgdm9pZCBjbGVhckFsbENvb2tpZXMoKTsKKwor ICAgIHZvaWQgZ2V0SG9zdE5hbWVzV2l0aENvb2tpZXMoV0tDb29raWVNYW5hZ2VyR2V0Q29va2ll SG9zdG5hbWVzRnVuY3Rpb24gY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKSBjb25zdDsKKyAgICB2 b2lkIHdhdGNoQ2hhbmdlcyhjb25zdCBDb29raWVfQ2hhbmdlX0hhbmRsZXImIGNoYW5nZUhhbmRs ZXIpOworCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IEV3a19Db29raWVfTWFuYWdlcihXS0Nvb2tp ZU1hbmFnZXJSZWYgY29va2llTWFuYWdlclJlZik7CisKKyAgICBib29sIGlzV2F0Y2hpbmdGb3JD aGFuZ2VzKCkgY29uc3Q7CisKKyAgICBzdGF0aWMgdm9pZCBjb29raWVzRGlkQ2hhbmdlKFdLQ29v a2llTWFuYWdlclJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CisKKyAgICBXS1JldGFpblB0 cjxXS0Nvb2tpZU1hbmFnZXJSZWY+IG1fd2tDb29raWVNYW5hZ2VyOworICAgIENvb2tpZV9DaGFu Z2VfSGFuZGxlciBtX2NoYW5nZUhhbmRsZXI7CiB9OwogCiAjZW5kaWYgLy8gZXdrX2Nvb2tpZV9t YW5hZ2VyX3ByaXZhdGVfaAo=