44680 2010-08-26 05:47:27 -0700 Web Inspector: InspectorValue accessors for Boolean type should have Boolean suffix 2010-08-26 06:12:07 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 269836 0 loislo 2010-08-26 05:47:27 -0700 It would be better to rename setBool, pushBool and asBool to setBoolean, pushBoolean and asBoolean for better matching with the results of JS typeof operator. 269839 1 65551 loislo 2010-08-26 05:57:55 -0700 Created attachment 65551 [patch] initial version. 269843 2 loislo 2010-08-26 06:12:07 -0700 Committed r66098 M WebCore/ChangeLog M WebCore/bindings/js/ScriptProfile.cpp M WebCore/bindings/v8/ScriptProfile.cpp M WebCore/inspector/CodeGeneratorInspector.pm M WebCore/inspector/InspectorDOMStorageResource.cpp M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorResource.cpp M WebCore/inspector/InspectorValues.h M WebCore/inspector/ScriptBreakpoint.cpp M WebCore/inspector/InspectorDOMAgent.cpp M WebCore/inspector/InspectorValues.cpp M WebCore/inspector/TimelineRecordFactory.cpp r66098 = ec5ebeb76b2656ed530de24ad25778299f38879c (refs/remotes/trunk) 65551 2010-08-26 05:57:55 -0700 2010-08-26 05:59:48 -0700 [patch] initial version. patch text/plain 22447 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzA2OTNhYi4uMTZhNmVlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NyBAQAorMjAxMC0wOC0yNiAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViSW5zcGVjdG9yOiBJdCB3b3VsZCBiZSBiZXR0ZXIgdG8g cmVuYW1lIHNldEJvb2wsIHB1c2hCb29sIGFuZCBhc0Jvb2wgYWNjZXNzb3JzCisgICAgICAgIHRv IHNldEJvb2xlYW4sIHB1c2hCb29sZWFuIGFuZCBhc0Jvb2xlYW4gZm9yIGJldHRlciBtYXRjaGlu ZyB3aXRoIHRoZSByZXN1bHRzIG9mCisgICAgICAgIEpTIHR5cGVvZiBvcGVyYXRvci4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NjgwCisKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9TY3JpcHRQcm9maWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1 aWxkSW5zcGVjdG9yT2JqZWN0Rm9yKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRQcm9m aWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkSW5zcGVjdG9yT2JqZWN0Rm9yKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JDb250cm9sbGVyOjpidWlsZE9iamVjdEZvckNvb2tpZSk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRP TUFnZW50OjpidWlsZE9iamVjdEZvckV2ZW50TGlzdGVuZXIpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NQWdlbnQ6OnBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6YnVpbGRPYmplY3RGb3JTdHlsZVNo ZWV0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZv clJ1bGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2Uu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlOjpiaW5k KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclZhbHVlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JWYWx1ZTo6YXNCb29sZWFuKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckJhc2lj VmFsdWU6OmFzQm9vbGVhbik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYXNpY1ZhbHVl Ojphc051bWJlcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYXNpY1ZhbHVlOjp3cml0 ZUpTT04pOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT2JqZWN0OjpnZXRCb29sZWFuKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmg6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JWYWx1ZTo6KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckJhc2ljVmFs dWU6Okluc3BlY3RvckJhc2ljVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT2Jq ZWN0OjpzZXRCb29sZWFuKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFycmF5OjpwdXNo Qm9vbGVhbik6CisgICAgICAgICogaW5zcGVjdG9yL1NjcmlwdEJyZWFrcG9pbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2NyaXB0QnJlYWtwb2ludDo6c291cmNlQnJlYWtwb2ludHNGcm9tSW5z cGVjdG9yT2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEJyZWFrcG9pbnQ6Omluc3Bl Y3Rvck9iamVjdEZyb21Tb3VyY2VCcmVha3BvaW50cyk6CisgICAgICAgICogaW5zcGVjdG9yL1Rp bWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29y ZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6VGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVNlbmRSZXF1ZXN0RGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlRmluaXNo RGF0YSk6CisKIDIwMTAtMDgtMjYgIEdpcmlzaCBSYW1ha3Jpc2huYW4gIDxnaXJpc2hAZm9yd2Fy ZGJpYXMuaW4+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFByb2ZpbGUuY3BwIGIvV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRQcm9maWxlLmNwcAppbmRleCAwZWIyODE0Li44NzMxZWMyIDEwMDY0NAot LS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFByb2ZpbGUuY3BwCisrKyBiL1dlYkNvcmUv YmluZGluZ3MvanMvU2NyaXB0UHJvZmlsZS5jcHAKQEAgLTc2LDcgKzc2LDcgQEAgc3RhdGljIFBh c3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZEluc3BlY3Rvck9iamVjdEZvcihjb25zdCBK U0M6OlByb2ZpbGVOb2QKICAgICByZXN1bHQtPnNldE51bWJlcigidG90YWxUaW1lIiwgbm9kZS0+ dG90YWxUaW1lKCkpOwogICAgIHJlc3VsdC0+c2V0TnVtYmVyKCJzZWxmVGltZSIsIG5vZGUtPnNl bGZUaW1lKCkpOwogICAgIHJlc3VsdC0+c2V0TnVtYmVyKCJudW1iZXJPZkNhbGxzIiwgbm9kZS0+ bnVtYmVyT2ZDYWxscygpKTsKLSAgICByZXN1bHQtPnNldEJvb2woInZpc2libGUiLCBub2RlLT52 aXNpYmxlKCkpOworICAgIHJlc3VsdC0+c2V0Qm9vbGVhbigidmlzaWJsZSIsIG5vZGUtPnZpc2li bGUoKSk7CiAgICAgcmVzdWx0LT5zZXROdW1iZXIoImNhbGxVSUQiLCBub2RlLT5jYWxsSWRlbnRp ZmllcigpLmhhc2goKSk7CiAKICAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGNoaWxkcmVuQXJy YXkgPSBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFByb2ZpbGUuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRQcm9m aWxlLmNwcAppbmRleCA5NWFjMGRlLi44NWRiYWRiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFByb2ZpbGUuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0 UHJvZmlsZS5jcHAKQEAgLTY1LDcgKzY1LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiBidWlsZEluc3BlY3Rvck9iamVjdEZvcihjb25zdCB2ODo6Q3B1UHJvZmlsZU4KICAg ICByZXN1bHQtPnNldE51bWJlcigidG90YWxUaW1lIiwgbm9kZS0+R2V0VG90YWxUaW1lKCkpOwog ICAgIHJlc3VsdC0+c2V0TnVtYmVyKCJzZWxmVGltZSIsIG5vZGUtPkdldFNlbGZUaW1lKCkpOwog ICAgIHJlc3VsdC0+c2V0TnVtYmVyKCJudW1iZXJPZkNhbGxzIiwgMCk7Ci0gICAgcmVzdWx0LT5z ZXRCb29sKCJ2aXNpYmxlIiwgdHJ1ZSk7CisgICAgcmVzdWx0LT5zZXRCb29sZWFuKCJ2aXNpYmxl IiwgdHJ1ZSk7CiAgICAgcmVzdWx0LT5zZXROdW1iZXIoImNhbGxVSUQiLCBub2RlLT5HZXRDYWxs VWlkKCkpOwogCiAgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBjaGlsZHJlbiA9IEluc3BlY3Rv ckFycmF5OjpjcmVhdGUoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5l cmF0b3JJbnNwZWN0b3IucG0gYi9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVj dG9yLnBtCmluZGV4IDcyMjNlOWUuLjA5YWYzMDUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvQ29k ZUdlbmVyYXRvckluc3BlY3Rvci5wbQpAQCAtMTIwLDcgKzEyMCw3IEBAICR0eXBlVHJhbnNmb3Jt eyJib29sZWFuIn0gPSB7CiAgICAgImRlZmF1bHRWYWx1ZSIgPT4gImZhbHNlIiwKICAgICAiZm9y d2FyZCIgPT4gIiIsCiAgICAgImhlYWRlciIgPT4gIiIsCi0gICAgIkpTT05UeXBlIiA9PiAiQm9v bCIKKyAgICAiSlNPTlR5cGUiID0+ICJCb29sZWFuIgogfTsKICR0eXBlVHJhbnNmb3JteyJ2b2lk In0gPSB7CiAgICAgImZvcndhcmQiID0+ICIiLApAQCAtMzU0LDcgKzM1NCw3IEBAIHN1YiBnZW5l cmF0ZUJhY2tlbmRGdW5jdGlvbgogICAgIHB1c2goQGZ1bmN0aW9uLCAiICAgIGlmICgoY2FsbElk IHx8IHByb3RvY29sRXJyb3JzLT5sZW5ndGgoKSkgJiYgbV9pbnNwZWN0b3JDb250cm9sbGVyLT5o YXNGcm9udGVuZCgpKSB7Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgIFJlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IHJlc3BvbnNlTWVzc2FnZSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRl KCk7Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgIHJlc3BvbnNlTWVzc2FnZS0+c2V0 TnVtYmVyKFwic2VxXCIsIGNhbGxJZCk7Iik7Ci0gICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAg IHJlc3BvbnNlTWVzc2FnZS0+c2V0Qm9vbChcInN1Y2Nlc3NcIiwgIXByb3RvY29sRXJyb3JzLT5s ZW5ndGgoKSk7Iik7CisgICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgIHJlc3BvbnNlTWVzc2Fn ZS0+c2V0Qm9vbGVhbihcInN1Y2Nlc3NcIiwgIXByb3RvY29sRXJyb3JzLT5sZW5ndGgoKSk7Iik7 CiAgICAgcHVzaChAZnVuY3Rpb24sICIiKTsKICAgICBwdXNoKEBmdW5jdGlvbiwgIiAgICAgICAg aWYgKHByb3RvY29sRXJyb3JzLT5sZW5ndGgoKSkiKTsKICAgICBwdXNoKEBmdW5jdGlvbiwgIiAg ICAgICAgICAgIHJlc3BvbnNlTWVzc2FnZS0+c2V0QXJyYXkoXCJlcnJvcnNcIiwgcHJvdG9jb2xF cnJvcnMpOyIpOwpAQCAtMzg1LDcgKzM4NSw3IEBAIHZvaWQgJHtiYWNrZW5kQ2xhc3NOYW1lfTo6 cmVwb3J0UHJvdG9jb2xFcnJvcihjb25zdCBsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBtCiAg ICAgbWVzc2FnZS0+c2V0U3RyaW5nKCJ0eXBlIiwgImVycm9yIik7CiAgICAgbWVzc2FnZS0+c2V0 U3RyaW5nKCJkb21haW4iLCAiaW5zcGVjdG9yUHJvdG9jb2wiKTsKICAgICBtZXNzYWdlLT5zZXRT dHJpbmcoImNvbW1hbmQiLCBtZXRob2QpOwotICAgIG1lc3NhZ2UtPnNldEJvb2woInN1Y2Nlc3Mi LCBmYWxzZSk7CisgICAgbWVzc2FnZS0+c2V0Qm9vbGVhbigic3VjY2VzcyIsIGZhbHNlKTsKICAg ICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGVycm9ycyA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUo KTsKICAgICBlcnJvcnMtPnB1c2hTdHJpbmcoZXJyb3JUZXh0KTsKICAgICBtZXNzYWdlLT5zZXRB cnJheSgiZXJyb3JzIiwgZXJyb3JzKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHAKaW5kZXggODkwZDU5OS4uN2ZiMDUyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTEzMzcsOSArMTMzNyw5IEBAIFBhc3NSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBJbnNwZWN0b3JDb250cm9sbGVyOjpidWlsZE9iamVjdEZvckNvb2tpZShj b25zdCBDb29rCiAgICAgdmFsdWUtPnNldFN0cmluZygicGF0aCIsIGNvb2tpZS5wYXRoKTsKICAg ICB2YWx1ZS0+c2V0TnVtYmVyKCJleHBpcmVzIiwgY29va2llLmV4cGlyZXMpOwogICAgIHZhbHVl LT5zZXROdW1iZXIoInNpemUiLCAoY29va2llLm5hbWUubGVuZ3RoKCkgKyBjb29raWUudmFsdWUu bGVuZ3RoKCkpKTsKLSAgICB2YWx1ZS0+c2V0Qm9vbCgiaHR0cE9ubHkiLCBjb29raWUuaHR0cE9u bHkpOwotICAgIHZhbHVlLT5zZXRCb29sKCJzZWN1cmUiLCBjb29raWUuc2VjdXJlKTsKLSAgICB2 YWx1ZS0+c2V0Qm9vbCgic2Vzc2lvbiIsIGNvb2tpZS5zZXNzaW9uKTsKKyAgICB2YWx1ZS0+c2V0 Qm9vbGVhbigiaHR0cE9ubHkiLCBjb29raWUuaHR0cE9ubHkpOworICAgIHZhbHVlLT5zZXRCb29s ZWFuKCJzZWN1cmUiLCBjb29raWUuc2VjdXJlKTsKKyAgICB2YWx1ZS0+c2V0Qm9vbGVhbigic2Vz c2lvbiIsIGNvb2tpZS5zZXNzaW9uKTsKICAgICByZXR1cm4gdmFsdWU7CiB9CiAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBiOGFlMDQ3Li42MzU3NjlhIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC04ODAsOCArODgwLDggQEAg UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVj dEZvckV2ZW50TGlzdGVuZXIoY29uc3QKICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gZXZlbnRM aXN0ZW5lciA9IHJlZ2lzdGVyZWRFdmVudExpc3RlbmVyLmxpc3RlbmVyOwogICAgIFJlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IHZhbHVlID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAgICB2 YWx1ZS0+c2V0U3RyaW5nKCJ0eXBlIiwgZXZlbnRUeXBlKTsKLSAgICB2YWx1ZS0+c2V0Qm9vbCgi dXNlQ2FwdHVyZSIsIHJlZ2lzdGVyZWRFdmVudExpc3RlbmVyLnVzZUNhcHR1cmUpOwotICAgIHZh bHVlLT5zZXRCb29sKCJpc0F0dHJpYnV0ZSIsIGV2ZW50TGlzdGVuZXItPmlzQXR0cmlidXRlKCkp OworICAgIHZhbHVlLT5zZXRCb29sZWFuKCJ1c2VDYXB0dXJlIiwgcmVnaXN0ZXJlZEV2ZW50TGlz dGVuZXIudXNlQ2FwdHVyZSk7CisgICAgdmFsdWUtPnNldEJvb2xlYW4oImlzQXR0cmlidXRlIiwg ZXZlbnRMaXN0ZW5lci0+aXNBdHRyaWJ1dGUoKSk7CiAgICAgdmFsdWUtPnNldE51bWJlcigibm9k ZUlkIiwgcHVzaE5vZGVQYXRoVG9Gcm9udGVuZChub2RlKSk7CiAgICAgdmFsdWUtPnNldFN0cmlu ZygibGlzdGVuZXJCb2R5IiwgZXZlbnRMaXN0ZW5lckhhbmRsZXJCb2R5KG5vZGUtPmRvY3VtZW50 KCksIGV2ZW50TGlzdGVuZXIuZ2V0KCkpKTsKICAgICBTdHJpbmcgc291cmNlTmFtZTsKQEAgLTE0 NjAsNyArMTQ2MCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnBvcHVsYXRlT2JqZWN0V2l0 aFN0eWxlUHJvcGVydGllcyhDU1NTdHlsZURlY2xhcmF0aW9uKiBzCiAgICAgICAgIFN0cmluZyBu YW1lID0gc3R5bGUtPml0ZW0oaSk7CiAgICAgICAgIHByb3BlcnR5LT5zZXRTdHJpbmcoIm5hbWUi LCBuYW1lKTsKICAgICAgICAgcHJvcGVydHktPnNldFN0cmluZygicHJpb3JpdHkiLCBzdHlsZS0+ Z2V0UHJvcGVydHlQcmlvcml0eShuYW1lKSk7Ci0gICAgICAgIHByb3BlcnR5LT5zZXRCb29sKCJp bXBsaWNpdCIsIHN0eWxlLT5pc1Byb3BlcnR5SW1wbGljaXQobmFtZSkpOworICAgICAgICBwcm9w ZXJ0eS0+c2V0Qm9vbGVhbigiaW1wbGljaXQiLCBzdHlsZS0+aXNQcm9wZXJ0eUltcGxpY2l0KG5h bWUpKTsKICAgICAgICAgU3RyaW5nIHNob3J0aGFuZCA9IHN0eWxlLT5nZXRQcm9wZXJ0eVNob3J0 aGFuZChuYW1lKTsKICAgICAgICAgcHJvcGVydHktPnNldFN0cmluZygic2hvcnRoYW5kIiwgc2hv cnRoYW5kKTsKICAgICAgICAgaWYgKCFzaG9ydGhhbmQuaXNFbXB0eSgpICYmICFmb3VuZFNob3J0 aGFuZHMuY29udGFpbnMoc2hvcnRoYW5kKSkgewpAQCAtMTQ5Miw3ICsxNDkyLDcgQEAgUGFzc1Jl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZvclN0 eWxlU2hlZXQoRG9jdW1lbnQKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXN1bHQgPSBJ bnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAgIGxvbmcgaWQgPSBjc3NTdG9yZSgpLT5iaW5k U3R5bGVTaGVldChzdHlsZVNoZWV0KTsKICAgICByZXN1bHQtPnNldE51bWJlcigiaWQiLCBpZCk7 Ci0gICAgcmVzdWx0LT5zZXRCb29sKCJkaXNhYmxlZCIsIHN0eWxlU2hlZXQtPmRpc2FibGVkKCkp OworICAgIHJlc3VsdC0+c2V0Qm9vbGVhbigiZGlzYWJsZWQiLCBzdHlsZVNoZWV0LT5kaXNhYmxl ZCgpKTsKICAgICByZXN1bHQtPnNldFN0cmluZygiaHJlZiIsIHN0eWxlU2hlZXQtPmhyZWYoKSk7 CiAgICAgcmVzdWx0LT5zZXRTdHJpbmcoInRpdGxlIiwgc3R5bGVTaGVldC0+dGl0bGUoKSk7CiAg ICAgcmVzdWx0LT5zZXROdW1iZXIoImRvY3VtZW50RWxlbWVudElkIiwgbV9kb2N1bWVudE5vZGVU b0lkTWFwLmdldChzdHlsZVNoZWV0LT5kb2MoKSkpOwpAQCAtMTUyNiw5ICsxNTI2LDkgQEAgUGFz c1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZv clJ1bGUoRG9jdW1lbnQqIG93bmUKICAgICB9CiAgICAgYm9vbCBpc1VzZXJBZ2VudCA9IHBhcmVu dFN0eWxlU2hlZXQgJiYgIXBhcmVudFN0eWxlU2hlZXQtPm93bmVyTm9kZSgpICYmIHBhcmVudFN0 eWxlU2hlZXQtPmhyZWYoKS5pc0VtcHR5KCk7CiAgICAgYm9vbCBpc1VzZXIgPSBwYXJlbnRTdHls ZVNoZWV0ICYmIHBhcmVudFN0eWxlU2hlZXQtPm93bmVyTm9kZSgpICYmIHBhcmVudFN0eWxlU2hl ZXQtPm93bmVyTm9kZSgpLT5ub2RlTmFtZSgpID09ICIjZG9jdW1lbnQiOwotICAgIHJlc3VsdC0+ c2V0Qm9vbCgiaXNVc2VyQWdlbnQiLCBpc1VzZXJBZ2VudCk7Ci0gICAgcmVzdWx0LT5zZXRCb29s KCJpc1VzZXIiLCBpc1VzZXIpOwotICAgIHJlc3VsdC0+c2V0Qm9vbCgiaXNWaWFJbnNwZWN0b3Ii LCBydWxlLT5wYXJlbnRTdHlsZVNoZWV0KCkgPT0gY3NzU3RvcmUoKS0+aW5zcGVjdG9yU3R5bGVT aGVldChvd25lckRvY3VtZW50LCBmYWxzZSkpOworICAgIHJlc3VsdC0+c2V0Qm9vbGVhbigiaXNV c2VyQWdlbnQiLCBpc1VzZXJBZ2VudCk7CisgICAgcmVzdWx0LT5zZXRCb29sZWFuKCJpc1VzZXIi LCBpc1VzZXIpOworICAgIHJlc3VsdC0+c2V0Qm9vbGVhbigiaXNWaWFJbnNwZWN0b3IiLCBydWxl LT5wYXJlbnRTdHlsZVNoZWV0KCkgPT0gY3NzU3RvcmUoKS0+aW5zcGVjdG9yU3R5bGVTaGVldChv d25lckRvY3VtZW50LCBmYWxzZSkpOwogCiAgICAgLy8gQmluZCBlZGl0YWJsZSBzY3JpcHRzIG9u bHkuCiAgICAgYm9vbCBiaW5kID0gIWlzVXNlckFnZW50ICYmICFpc1VzZXI7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UuY3BwIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlLmNwcAppbmRleCA3MmI0 ZTEwLi5jOGQ3NmJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01T dG9yYWdlUmVzb3VyY2UuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0 b3JhZ2VSZXNvdXJjZS5jcHAKQEAgLTcxLDcgKzcxLDcgQEAgdm9pZCBJbnNwZWN0b3JET01TdG9y YWdlUmVzb3VyY2U6OmJpbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogCiAgICAgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4ganNvbk9iamVjdCA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRl KCk7CiAgICAganNvbk9iamVjdC0+c2V0U3RyaW5nKCJob3N0IiwgbV9mcmFtZS0+ZG9jdW1lbnQo KS0+c2VjdXJpdHlPcmlnaW4oKS0+aG9zdCgpKTsKLSAgICBqc29uT2JqZWN0LT5zZXRCb29sKCJp c0xvY2FsU3RvcmFnZSIsIG1faXNMb2NhbFN0b3JhZ2UpOworICAgIGpzb25PYmplY3QtPnNldEJv b2xlYW4oImlzTG9jYWxTdG9yYWdlIiwgbV9pc0xvY2FsU3RvcmFnZSk7CiAgICAganNvbk9iamVj dC0+c2V0TnVtYmVyKCJpZCIsIG1faWQpOwogICAgIGZyb250ZW5kLT5hZGRET01TdG9yYWdlKGpz b25PYmplY3QpOwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVz b3VyY2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCmluZGV4 IGVkMDczMzkuLjEzMWNlOTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clJlc291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5j cHAKQEAgLTE5MCwxMCArMTkwLDEwIEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVNj cmlwdE9iamVjdChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCiAgICAgICAgIGpzb25PYmpl Y3QtPnNldFN0cmluZygibGFzdFBhdGhDb21wb25lbnQiLCBtX3JlcXVlc3RVUkwubGFzdFBhdGhD b21wb25lbnQoKSk7CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlcXVlc3RIZWFk ZXJzID0gYnVpbGRIZWFkZXJzT2JqZWN0KG1fcmVxdWVzdEhlYWRlckZpZWxkcyk7CiAgICAgICAg IGpzb25PYmplY3QtPnNldE9iamVjdCgicmVxdWVzdEhlYWRlcnMiLCByZXF1ZXN0SGVhZGVycyk7 Ci0gICAgICAgIGpzb25PYmplY3QtPnNldEJvb2woIm1haW5SZXNvdXJjZSIsIG1faXNNYWluUmVz b3VyY2UpOworICAgICAgICBqc29uT2JqZWN0LT5zZXRCb29sZWFuKCJtYWluUmVzb3VyY2UiLCBt X2lzTWFpblJlc291cmNlKTsKICAgICAgICAganNvbk9iamVjdC0+c2V0U3RyaW5nKCJyZXF1ZXN0 TWV0aG9kIiwgbV9yZXF1ZXN0TWV0aG9kKTsKICAgICAgICAganNvbk9iamVjdC0+c2V0U3RyaW5n KCJyZXF1ZXN0Rm9ybURhdGEiLCBtX3JlcXVlc3RGb3JtRGF0YSk7Ci0gICAgICAgIGpzb25PYmpl Y3QtPnNldEJvb2woImRpZFJlcXVlc3RDaGFuZ2UiLCB0cnVlKTsKKyAgICAgICAganNvbk9iamVj dC0+c2V0Qm9vbGVhbigiZGlkUmVxdWVzdENoYW5nZSIsIHRydWUpOwogICAgIH0KIAogICAgIGlm IChtX2NoYW5nZXMuaGFzQ2hhbmdlKFJlc3BvbnNlQ2hhbmdlKSkgewpAQCAtMjA1LDI3ICsyMDUs MjcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRlU2NyaXB0T2JqZWN0KEluc3BlY3Rv ckZyb250ZW5kKiBmcm9udGVuZCkKICAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVz cG9uc2VIZWFkZXJzID0gYnVpbGRIZWFkZXJzT2JqZWN0KG1fcmVzcG9uc2VIZWFkZXJGaWVsZHMp OwogICAgICAgICBqc29uT2JqZWN0LT5zZXRPYmplY3QoInJlc3BvbnNlSGVhZGVycyIsIHJlc3Bv bnNlSGVhZGVycyk7CiAgICAgICAgIGpzb25PYmplY3QtPnNldE51bWJlcigiY29ubmVjdGlvbklE IiwgbV9jb25uZWN0aW9uSUQpOwotICAgICAgICBqc29uT2JqZWN0LT5zZXRCb29sKCJjb25uZWN0 aW9uUmV1c2VkIiwgbV9jb25uZWN0aW9uUmV1c2VkKTsKLSAgICAgICAganNvbk9iamVjdC0+c2V0 Qm9vbCgiY2FjaGVkIiwgbV9jYWNoZWQpOworICAgICAgICBqc29uT2JqZWN0LT5zZXRCb29sZWFu KCJjb25uZWN0aW9uUmV1c2VkIiwgbV9jb25uZWN0aW9uUmV1c2VkKTsKKyAgICAgICAganNvbk9i amVjdC0+c2V0Qm9vbGVhbigiY2FjaGVkIiwgbV9jYWNoZWQpOwogICAgICAgICBpZiAobV9sb2Fk VGltaW5nICYmICFtX2NhY2hlZCkKICAgICAgICAgICAgIGpzb25PYmplY3QtPnNldE9iamVjdCgi dGltaW5nIiwgYnVpbGRPYmplY3RGb3JUaW1pbmcobV9sb2FkVGltaW5nLmdldCgpKSk7Ci0gICAg ICAgIGpzb25PYmplY3QtPnNldEJvb2woImRpZFJlc3BvbnNlQ2hhbmdlIiwgdHJ1ZSk7CisgICAg ICAgIGpzb25PYmplY3QtPnNldEJvb2xlYW4oImRpZFJlc3BvbnNlQ2hhbmdlIiwgdHJ1ZSk7CiAg ICAgfQogCiAgICAgaWYgKG1fY2hhbmdlcy5oYXNDaGFuZ2UoVHlwZUNoYW5nZSkpIHsKICAgICAg ICAganNvbk9iamVjdC0+c2V0TnVtYmVyKCJ0eXBlIiwgc3RhdGljX2Nhc3Q8aW50Pih0eXBlKCkp KTsKLSAgICAgICAganNvbk9iamVjdC0+c2V0Qm9vbCgiZGlkVHlwZUNoYW5nZSIsIHRydWUpOwor ICAgICAgICBqc29uT2JqZWN0LT5zZXRCb29sZWFuKCJkaWRUeXBlQ2hhbmdlIiwgdHJ1ZSk7CiAg ICAgfQogCiAgICAgaWYgKG1fY2hhbmdlcy5oYXNDaGFuZ2UoTGVuZ3RoQ2hhbmdlKSkgewogICAg ICAgICBqc29uT2JqZWN0LT5zZXROdW1iZXIoInJlc291cmNlU2l6ZSIsIG1fbGVuZ3RoKTsKLSAg ICAgICAganNvbk9iamVjdC0+c2V0Qm9vbCgiZGlkTGVuZ3RoQ2hhbmdlIiwgdHJ1ZSk7CisgICAg ICAgIGpzb25PYmplY3QtPnNldEJvb2xlYW4oImRpZExlbmd0aENoYW5nZSIsIHRydWUpOwogICAg IH0KIAogICAgIGlmIChtX2NoYW5nZXMuaGFzQ2hhbmdlKENvbXBsZXRpb25DaGFuZ2UpKSB7Ci0g ICAgICAgIGpzb25PYmplY3QtPnNldEJvb2woImZhaWxlZCIsIG1fZmFpbGVkKTsKLSAgICAgICAg anNvbk9iamVjdC0+c2V0Qm9vbCgiZmluaXNoZWQiLCBtX2ZpbmlzaGVkKTsKLSAgICAgICAganNv bk9iamVjdC0+c2V0Qm9vbCgiZGlkQ29tcGxldGlvbkNoYW5nZSIsIHRydWUpOworICAgICAgICBq c29uT2JqZWN0LT5zZXRCb29sZWFuKCJmYWlsZWQiLCBtX2ZhaWxlZCk7CisgICAgICAgIGpzb25P YmplY3QtPnNldEJvb2xlYW4oImZpbmlzaGVkIiwgbV9maW5pc2hlZCk7CisgICAgICAgIGpzb25P YmplY3QtPnNldEJvb2xlYW4oImRpZENvbXBsZXRpb25DaGFuZ2UiLCB0cnVlKTsKICAgICB9CiAK ICAgICBpZiAobV9jaGFuZ2VzLmhhc0NoYW5nZShUaW1pbmdDaGFuZ2UpKSB7CkBAIC0yMzksNyAr MjM5LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZTo6dXBkYXRlU2NyaXB0T2JqZWN0KEluc3Bl Y3RvckZyb250ZW5kKiBmcm9udGVuZCkKICAgICAgICAgICAgIGpzb25PYmplY3QtPnNldE51bWJl cigibG9hZEV2ZW50VGltZSIsIG1fbG9hZEV2ZW50VGltZSk7CiAgICAgICAgIGlmIChtX2RvbUNv bnRlbnRFdmVudFRpbWUgPiAwKQogICAgICAgICAgICAganNvbk9iamVjdC0+c2V0TnVtYmVyKCJk b21Db250ZW50RXZlbnRUaW1lIiwgbV9kb21Db250ZW50RXZlbnRUaW1lKTsKLSAgICAgICAganNv bk9iamVjdC0+c2V0Qm9vbCgiZGlkVGltaW5nQ2hhbmdlIiwgdHJ1ZSk7CisgICAgICAgIGpzb25P YmplY3QtPnNldEJvb2xlYW4oImRpZFRpbWluZ0NoYW5nZSIsIHRydWUpOwogICAgIH0KIAogICAg IGlmIChtX2NoYW5nZXMuaGFzQ2hhbmdlKFJlZGlyZWN0c0NoYW5nZSkpIHsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclZhbHVlcy5jcHAgYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JWYWx1ZXMuY3BwCmluZGV4IGE3YzQzYTUuLmM5NmU5NTMgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclZhbHVlcy5jcHAKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmNwcApAQCAtNDc0LDcgKzQ3NCw3IEBAIGlubGluZSB2b2lk IGRvdWJsZVF1b3RlU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyLCBWZWN0b3I8VUNoYXI+KiBkc3Qp CiAKIH0gLy8gYW5vbnltb3VzIG5hbWVzcGFjZQogCi1ib29sIEluc3BlY3RvclZhbHVlOjphc0Jv b2woYm9vbCopIGNvbnN0Citib29sIEluc3BlY3RvclZhbHVlOjphc0Jvb2xlYW4oYm9vbCopIGNv bnN0CiB7CiAgICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtNTU1LDcgKzU1NSw3IEBAIHZvaWQgSW5z cGVjdG9yVmFsdWU6OndyaXRlSlNPTihWZWN0b3I8VUNoYXI+KiBvdXRwdXQpIGNvbnN0CiAgICAg b3V0cHV0LT5hcHBlbmQobnVsbFN0cmluZywgNCk7CiB9CiAKLWJvb2wgSW5zcGVjdG9yQmFzaWNW YWx1ZTo6YXNCb29sKGJvb2wqIG91dHB1dCkgY29uc3QKK2Jvb2wgSW5zcGVjdG9yQmFzaWNWYWx1 ZTo6YXNCb29sZWFuKGJvb2wqIG91dHB1dCkgY29uc3QKIHsKICAgICBpZiAodHlwZSgpICE9IFR5 cGVCb29sZWFuKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC01NjUsNyArNTY1LDcgQEAgYm9v bCBJbnNwZWN0b3JCYXNpY1ZhbHVlOjphc0Jvb2woYm9vbCogb3V0cHV0KSBjb25zdAogCiBib29s IEluc3BlY3RvckJhc2ljVmFsdWU6OmFzTnVtYmVyKGRvdWJsZSogb3V0cHV0KSBjb25zdAogewot ICAgIGlmICh0eXBlKCkgIT0gVHlwZURvdWJsZSkKKyAgICBpZiAodHlwZSgpICE9IFR5cGVOdW1i ZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAqb3V0cHV0ID0gbV9kb3VibGVWYWx1ZTsK ICAgICByZXR1cm4gdHJ1ZTsKQEAgLTU3Myw3ICs1NzMsNyBAQCBib29sIEluc3BlY3RvckJhc2lj VmFsdWU6OmFzTnVtYmVyKGRvdWJsZSogb3V0cHV0KSBjb25zdAogCiBib29sIEluc3BlY3RvckJh c2ljVmFsdWU6OmFzTnVtYmVyKGxvbmcqIG91dHB1dCkgY29uc3QKIHsKLSAgICBpZiAodHlwZSgp ICE9IFR5cGVEb3VibGUpCisgICAgaWYgKHR5cGUoKSAhPSBUeXBlTnVtYmVyKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgKm91dHB1dCA9IHN0YXRpY19jYXN0PGxvbmc+KG1fZG91YmxlVmFs dWUpOwogICAgIHJldHVybiB0cnVlOwpAQCAtNTgxLDcgKzU4MSw3IEBAIGJvb2wgSW5zcGVjdG9y QmFzaWNWYWx1ZTo6YXNOdW1iZXIobG9uZyogb3V0cHV0KSBjb25zdAogCiBib29sIEluc3BlY3Rv ckJhc2ljVmFsdWU6OmFzTnVtYmVyKHVuc2lnbmVkIGxvbmcqIG91dHB1dCkgY29uc3QKIHsKLSAg ICBpZiAodHlwZSgpICE9IFR5cGVEb3VibGUpCisgICAgaWYgKHR5cGUoKSAhPSBUeXBlTnVtYmVy KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgKm91dHB1dCA9IHN0YXRpY19jYXN0PHVuc2ln bmVkIGxvbmc+KG1fZG91YmxlVmFsdWUpOwogICAgIHJldHVybiB0cnVlOwpAQCAtNTg5LDcgKzU4 OSw3IEBAIGJvb2wgSW5zcGVjdG9yQmFzaWNWYWx1ZTo6YXNOdW1iZXIodW5zaWduZWQgbG9uZyog b3V0cHV0KSBjb25zdAogCiBib29sIEluc3BlY3RvckJhc2ljVmFsdWU6OmFzTnVtYmVyKHVuc2ln bmVkIGludCogb3V0cHV0KSBjb25zdAogewotICAgIGlmICh0eXBlKCkgIT0gVHlwZURvdWJsZSkK KyAgICBpZiAodHlwZSgpICE9IFR5cGVOdW1iZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICAqb3V0cHV0ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQgaW50PihtX2RvdWJsZVZhbHVlKTsKICAg ICByZXR1cm4gdHJ1ZTsKQEAgLTU5NywxMyArNTk3LDEzIEBAIGJvb2wgSW5zcGVjdG9yQmFzaWNW YWx1ZTo6YXNOdW1iZXIodW5zaWduZWQgaW50KiBvdXRwdXQpIGNvbnN0CiAKIHZvaWQgSW5zcGVj dG9yQmFzaWNWYWx1ZTo6d3JpdGVKU09OKFZlY3RvcjxVQ2hhcj4qIG91dHB1dCkgY29uc3QKIHsK LSAgICBBU1NFUlQodHlwZSgpID09IFR5cGVCb29sZWFuIHx8IHR5cGUoKSA9PSBUeXBlRG91Ymxl KTsKKyAgICBBU1NFUlQodHlwZSgpID09IFR5cGVCb29sZWFuIHx8IHR5cGUoKSA9PSBUeXBlTnVt YmVyKTsKICAgICBpZiAodHlwZSgpID09IFR5cGVCb29sZWFuKSB7CiAgICAgICAgIGlmIChtX2Jv b2xWYWx1ZSkKICAgICAgICAgICAgIG91dHB1dC0+YXBwZW5kKHRydWVTdHJpbmcsIDQpOwogICAg ICAgICBlbHNlCiAgICAgICAgICAgICBvdXRwdXQtPmFwcGVuZChmYWxzZVN0cmluZywgNSk7Ci0g ICAgfSBlbHNlIGlmICh0eXBlKCkgPT0gVHlwZURvdWJsZSkgeworICAgIH0gZWxzZSBpZiAodHlw ZSgpID09IFR5cGVOdW1iZXIpIHsKICAgICAgICAgU3RyaW5nIHZhbHVlID0gU3RyaW5nOjpmb3Jt YXQoIiVmIiwgbV9kb3VibGVWYWx1ZSk7CiAgICAgICAgIHZhbHVlLnJlcGxhY2UoJywnLCAnLicp OwogICAgICAgICBvdXRwdXQtPmFwcGVuZCh2YWx1ZS5jaGFyYWN0ZXJzKCksIHZhbHVlLmxlbmd0 aCgpKTsKQEAgLTYzMywxMiArNjMzLDEyIEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBJ bnNwZWN0b3JPYmplY3Q6OmFzT2JqZWN0KCkKICAgICByZXR1cm4gdGhpczsKIH0KIAotYm9vbCBJ bnNwZWN0b3JPYmplY3Q6OmdldEJvb2woY29uc3QgU3RyaW5nJiBuYW1lLCBib29sKiBvdXRwdXQp IGNvbnN0Citib29sIEluc3BlY3Rvck9iamVjdDo6Z2V0Qm9vbGVhbihjb25zdCBTdHJpbmcmIG5h bWUsIGJvb2wqIG91dHB1dCkgY29uc3QKIHsKICAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IHZh bHVlID0gZ2V0KG5hbWUpOwogICAgIGlmICghdmFsdWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICByZXR1cm4gdmFsdWUtPmFzQm9vbChvdXRwdXQpOworICAgIHJldHVybiB2YWx1ZS0+YXNC b29sZWFuKG91dHB1dCk7CiB9CiAKIGJvb2wgSW5zcGVjdG9yT2JqZWN0OjpnZXROdW1iZXIoY29u c3QgU3RyaW5nJiBuYW1lLCBkb3VibGUqIG91dHB1dCkgY29uc3QKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclZhbHVlcy5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVmFsdWVzLmgKaW5kZXggNDczYWQyMS4uM2RkOTU5NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVmFsdWVzLmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIHR5cGVkZWYgZW51bSB7 CiAgICAgICAgIFR5cGVOdWxsID0gMCwKICAgICAgICAgVHlwZUJvb2xlYW4sCi0gICAgICAgIFR5 cGVEb3VibGUsCisgICAgICAgIFR5cGVOdW1iZXIsCiAgICAgICAgIFR5cGVTdHJpbmcsCiAgICAg ICAgIFR5cGVPYmplY3QsCiAgICAgICAgIFR5cGVBcnJheQpAQCAtNjcsNyArNjcsNyBAQCBwdWJs aWM6CiAKICAgICBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7IH0KIAotICAgIHZp cnR1YWwgYm9vbCBhc0Jvb2woYm9vbCogb3V0cHV0KSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wg YXNCb29sZWFuKGJvb2wqIG91dHB1dCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGFzTnVtYmVy KGRvdWJsZSogb3V0cHV0KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgYXNOdW1iZXIobG9uZyog b3V0cHV0KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgYXNOdW1iZXIodW5zaWduZWQgbG9uZyog b3V0cHV0KSBjb25zdDsKQEAgLTEwOSw3ICsxMDksNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVy biBhZG9wdFJlZihuZXcgSW5zcGVjdG9yQmFzaWNWYWx1ZSh2YWx1ZSkpOwogICAgIH0KIAotICAg IHZpcnR1YWwgYm9vbCBhc0Jvb2woYm9vbCogb3V0cHV0KSBjb25zdDsKKyAgICB2aXJ0dWFsIGJv b2wgYXNCb29sZWFuKGJvb2wqIG91dHB1dCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGFzTnVt YmVyKGRvdWJsZSogb3V0cHV0KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgYXNOdW1iZXIobG9u Zyogb3V0cHV0KSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgYXNOdW1iZXIodW5zaWduZWQgbG9u Zyogb3V0cHV0KSBjb25zdDsKQEAgLTExOSw4ICsxMTksOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6 CiAgICAgZXhwbGljaXQgSW5zcGVjdG9yQmFzaWNWYWx1ZShib29sIHZhbHVlKSA6IEluc3BlY3Rv clZhbHVlKFR5cGVCb29sZWFuKSwgbV9ib29sVmFsdWUodmFsdWUpIHsgfQotICAgIGV4cGxpY2l0 IEluc3BlY3RvckJhc2ljVmFsdWUoaW50IHZhbHVlKSA6IEluc3BlY3RvclZhbHVlKFR5cGVEb3Vi bGUpLCBtX2RvdWJsZVZhbHVlKChkb3VibGUpdmFsdWUpIHsgfQotICAgIGV4cGxpY2l0IEluc3Bl Y3RvckJhc2ljVmFsdWUoZG91YmxlIHZhbHVlKSA6IEluc3BlY3RvclZhbHVlKFR5cGVEb3VibGUp LCBtX2RvdWJsZVZhbHVlKHZhbHVlKSB7IH0KKyAgICBleHBsaWNpdCBJbnNwZWN0b3JCYXNpY1Zh bHVlKGludCB2YWx1ZSkgOiBJbnNwZWN0b3JWYWx1ZShUeXBlTnVtYmVyKSwgbV9kb3VibGVWYWx1 ZSgoZG91YmxlKXZhbHVlKSB7IH0KKyAgICBleHBsaWNpdCBJbnNwZWN0b3JCYXNpY1ZhbHVlKGRv dWJsZSB2YWx1ZSkgOiBJbnNwZWN0b3JWYWx1ZShUeXBlTnVtYmVyKSwgbV9kb3VibGVWYWx1ZSh2 YWx1ZSkgeyB9CiAKICAgICB1bmlvbiB7CiAgICAgICAgIGJvb2wgbV9ib29sVmFsdWU7CkBAIC0x NjksNyArMTY5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBhc09iamVjdChSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0Piogb3V0cHV0KTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiBhc09iamVjdCgpOwogCi0gICAgdm9pZCBzZXRCb29sKGNvbnN0IFN0cmluZyYg bmFtZSwgYm9vbCk7CisgICAgdm9pZCBzZXRCb29sZWFuKGNvbnN0IFN0cmluZyYgbmFtZSwgYm9v bCk7CiAgICAgdm9pZCBzZXROdW1iZXIoY29uc3QgU3RyaW5nJiBuYW1lLCBkb3VibGUpOwogICAg IHZvaWQgc2V0U3RyaW5nKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJik7CiAgICAg dm9pZCBzZXRWYWx1ZShjb25zdCBTdHJpbmcmIG5hbWUsIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFs dWU+KTsKQEAgLTE3Nyw3ICsxNzcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRBcnJheShjb25z dCBTdHJpbmcmIG5hbWUsIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KTsKIAogICAgIGNvbnN0 X2l0ZXJhdG9yIGZpbmQoY29uc3QgU3RyaW5nJiBuYW1lKSBjb25zdDsKLSAgICBib29sIGdldEJv b2woY29uc3QgU3RyaW5nJiBuYW1lLCBib29sKiBvdXRwdXQpIGNvbnN0OworICAgIGJvb2wgZ2V0 Qm9vbGVhbihjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIG91dHB1dCkgY29uc3Q7CiAgICAgYm9v bCBnZXROdW1iZXIoY29uc3QgU3RyaW5nJiBuYW1lLCBkb3VibGUqIG91dHB1dCkgY29uc3Q7CiAg ICAgYm9vbCBnZXRTdHJpbmcoY29uc3QgU3RyaW5nJiBuYW1lLCBTdHJpbmcqIG91dHB1dCkgY29u c3Q7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGdldE9iamVjdChjb25zdCBTdHJp bmcmIG5hbWUpIGNvbnN0OwpAQCAtMjA4LDcgKzIwOCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IGJvb2wgYXNBcnJheShSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBvdXRwdXQpOwogICAgIHZpcnR1 YWwgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gYXNBcnJheSgpOwogCi0gICAgdm9pZCBwdXNo Qm9vbChib29sKTsKKyAgICB2b2lkIHB1c2hCb29sZWFuKGJvb2wpOwogICAgIHZvaWQgcHVzaE51 bWJlcihkb3VibGUpOwogICAgIHZvaWQgcHVzaFN0cmluZyhjb25zdCBTdHJpbmcmKTsKICAgICB2 b2lkIHB1c2hWYWx1ZShQYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPik7CkBAIC0yMzAsNyArMjMw LDcgQEAgaW5saW5lIEluc3BlY3Rvck9iamVjdDo6Y29uc3RfaXRlcmF0b3IgSW5zcGVjdG9yT2Jq ZWN0OjpmaW5kKGNvbnN0IFN0cmluZyYgbmFtZSkKICAgICByZXR1cm4gbV9kYXRhLmZpbmQobmFt ZSk7CiB9CiAKLWlubGluZSB2b2lkIEluc3BlY3Rvck9iamVjdDo6c2V0Qm9vbChjb25zdCBTdHJp bmcmIG5hbWUsIGJvb2wgdmFsdWUpCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JPYmplY3Q6OnNldEJv b2xlYW4oY29uc3QgU3RyaW5nJiBuYW1lLCBib29sIHZhbHVlKQogewogICAgIHNldFZhbHVlKG5h bWUsIEluc3BlY3RvckJhc2ljVmFsdWU6OmNyZWF0ZSh2YWx1ZSkpOwogfQpAQCAtMjYzLDcgKzI2 Myw3IEBAIGlubGluZSB2b2lkIEluc3BlY3Rvck9iamVjdDo6c2V0QXJyYXkoY29uc3QgU3RyaW5n JiBuYW1lLCBQYXNzUmVmUHRyPEluc3BlY3RvckFyCiAgICAgICAgIG1fb3JkZXIuYXBwZW5kKG5h bWUpOwogfQogCi1pbmxpbmUgdm9pZCBJbnNwZWN0b3JBcnJheTo6cHVzaEJvb2woYm9vbCB2YWx1 ZSkKK2lubGluZSB2b2lkIEluc3BlY3RvckFycmF5OjpwdXNoQm9vbGVhbihib29sIHZhbHVlKQog ewogICAgIG1fZGF0YS5hcHBlbmQoSW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKHZhbHVlKSk7 CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHRCcmVha3BvaW50LmNwcCBi L1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdEJyZWFrcG9pbnQuY3BwCmluZGV4IDI0NDAxZjEuLmI3 MjA1YTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdEJyZWFrcG9pbnQuY3Bw CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdEJyZWFrcG9pbnQuY3BwCkBAIC00Nyw3ICs0 Nyw3IEBAIHZvaWQgU2NyaXB0QnJlYWtwb2ludDo6c291cmNlQnJlYWtwb2ludHNGcm9tSW5zcGVj dG9yT2JqZWN0KFBhc3NSZWZQdHI8SW5zcGVjdG9yCiAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgYm9vbCBlbmFibGVkOwogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGVuYWJs ZWRWYWx1ZSA9IGJyZWFrcG9pbnQtPmdldCgiZW5hYmxlZCIpOwotICAgICAgICBpZiAoIWVuYWJs ZWRWYWx1ZSB8fCAhZW5hYmxlZFZhbHVlLT5hc0Jvb2woJmVuYWJsZWQpKQorICAgICAgICBpZiAo IWVuYWJsZWRWYWx1ZSB8fCAhZW5hYmxlZFZhbHVlLT5hc0Jvb2xlYW4oJmVuYWJsZWQpKQogICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgIFN0cmluZyBjb25kaXRpb247CiAgICAgICAgIFJl ZlB0cjxJbnNwZWN0b3JWYWx1ZT4gY29uZGl0aW9uVmFsdWUgPSBicmVha3BvaW50LT5nZXQoImNv bmRpdGlvbiIpOwpAQCAtNjIsNyArNjIsNyBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4g U2NyaXB0QnJlYWtwb2ludDo6aW5zcGVjdG9yT2JqZWN0RnJvbVNvdXJjZUJyZWFrcG9pbgogICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnRzID0gSW5zcGVjdG9yT2JqZWN0Ojpj cmVhdGUoKTsKICAgICBmb3IgKFNvdXJjZUJyZWFrcG9pbnRzOjpjb25zdF9pdGVyYXRvciBpdCA9 IHNvdXJjZUJyZWFrcG9pbnRzLmJlZ2luKCk7IGl0ICE9IHNvdXJjZUJyZWFrcG9pbnRzLmVuZCgp OyArK2l0KSB7CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJyZWFrcG9pbnQgPSBJ bnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgICAgICBicmVha3BvaW50LT5zZXRCb29sKCJl bmFibGVkIiwgaXQtPnNlY29uZC5lbmFibGVkKTsKKyAgICAgICAgYnJlYWtwb2ludC0+c2V0Qm9v bGVhbigiZW5hYmxlZCIsIGl0LT5zZWNvbmQuZW5hYmxlZCk7CiAgICAgICAgIGJyZWFrcG9pbnQt PnNldFN0cmluZygiY29uZGl0aW9uIiwgaXQtPnNlY29uZC5jb25kaXRpb24pOwogICAgICAgICBi cmVha3BvaW50cy0+c2V0T2JqZWN0KFN0cmluZzo6bnVtYmVyKGl0LT5maXJzdCksIGJyZWFrcG9p bnQpOwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3Jk RmFjdG9yeS5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3Bw CmluZGV4IGUxYzJiYmIuLjcxM2Q2YmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1Rp bWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVS ZWNvcmRGYWN0b3J5LmNwcApAQCAtODcsNyArODcsNyBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lckluc3RhbGxEYXRhKGludCB0 aQogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNy ZWF0ZSgpOwogICAgIGRhdGEtPnNldE51bWJlcigidGltZXJJZCIsIHRpbWVySWQpOwogICAgIGRh dGEtPnNldE51bWJlcigidGltZW91dCIsIHRpbWVvdXQpOwotICAgIGRhdGEtPnNldEJvb2woInNp bmdsZVNob3QiLCBzaW5nbGVTaG90KTsKKyAgICBkYXRhLT5zZXRCb29sZWFuKCJzaW5nbGVTaG90 Iiwgc2luZ2xlU2hvdCk7CiAgICAgcmV0dXJuIGRhdGEucmVsZWFzZSgpOwogfQogCkBAIC0xMzQs NyArMTM0LDcgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlUmVzb3VyY2VTZW5kUmVxdWVzdERhdGEKICAgICBkYXRhLT5zZXROdW1iZXIo ImlkZW50aWZpZXIiLCBpZGVudGlmaWVyKTsKICAgICBkYXRhLT5zZXRTdHJpbmcoInVybCIsIHJl cXVlc3QudXJsKCkuc3RyaW5nKCkpOwogICAgIGRhdGEtPnNldFN0cmluZygicmVxdWVzdE1ldGhv ZCIsIHJlcXVlc3QuaHR0cE1ldGhvZCgpKTsKLSAgICBkYXRhLT5zZXRCb29sKCJpc01haW5SZXNv dXJjZSIsIGlzTWFpblJlc291cmNlKTsKKyAgICBkYXRhLT5zZXRCb29sZWFuKCJpc01haW5SZXNv dXJjZSIsIGlzTWFpblJlc291cmNlKTsKICAgICByZXR1cm4gZGF0YS5yZWxlYXNlKCk7CiB9CiAK QEAgLTE1Miw3ICsxNTIsNyBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZUZpbmlzaERhdGEodW5zaQogewogICAgIFJlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAg IGRhdGEtPnNldE51bWJlcigiaWRlbnRpZmllciIsIGlkZW50aWZpZXIpOwotICAgIGRhdGEtPnNl dEJvb2woImRpZEZhaWwiLCBkaWRGYWlsKTsKKyAgICBkYXRhLT5zZXRCb29sZWFuKCJkaWRGYWls IiwgZGlkRmFpbCk7CiAgICAgcmV0dXJuIGRhdGEucmVsZWFzZSgpOwogfQogCg==