128407 2014-02-07 15:28:55 -0800 Remove some unused functions from SerializedScriptValue 2014-02-10 13:32:10 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap alecflett andersca commit-queue jsbell oliver sam oldest_to_newest 978100 0 ap 2014-02-07 15:28:55 -0800 SerializedScriptValue has accumulated a lot of cruft. I'll remove it in small steps, as maybe some ports still use some of that. 978101 1 223504 ap 2014-02-07 15:30:07 -0800 Created attachment 223504 proposed patch 978171 2 223504 commit-queue 2014-02-07 17:05:04 -0800 Comment on attachment 223504 proposed patch Clearing flags on attachment: 223504 Committed r163667: <http://trac.webkit.org/changeset/163667> 978172 3 commit-queue 2014-02-07 17:05:07 -0800 All reviewed patches have been landed. Closing bug. 978446 4 ap 2014-02-08 15:23:28 -0800 Re-opening for more. 978450 5 223589 ap 2014-02-08 15:29:32 -0800 Created attachment 223589 part 2 978468 6 223589 commit-queue 2014-02-08 17:16:36 -0800 Comment on attachment 223589 part 2 Clearing flags on attachment: 223589 Committed r163732: <http://trac.webkit.org/changeset/163732> 978469 7 commit-queue 2014-02-08 17:16:38 -0800 All reviewed patches have been landed. Closing bug. 979016 8 ap 2014-02-10 13:16:21 -0800 And yet more. 979018 9 223737 ap 2014-02-10 13:18:31 -0800 Created attachment 223737 part 3 979020 10 commit-queue 2014-02-10 13:21:33 -0800 Attachment 223737 did not pass style-queue: ERROR: Source/WebCore/bindings/js/IDBBindingUtilities.cpp:335: An else should appear on the same line as the preceding } [whitespace/newline] [4] ERROR: Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp:146: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp:147: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp:148: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 979025 11 ap 2014-02-10 13:32:10 -0800 Committed <http://trac.webkit.org/r163810>. 223504 2014-02-07 15:30:07 -0800 2014-02-07 17:05:04 -0800 proposed patch Remove1.txt text/plain 5122 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MzY1NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAyLTA3ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzb21lIHVudXNl ZCBmdW5jdGlvbnMgZnJvbSBTZXJpYWxpemVkU2NyaXB0VmFsdWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODQwNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvU2VyaWFsaXplZFNj cmlwdFZhbHVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6 dW5kZWZpbmVkVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVl OjpudWxsVmFsdWUpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1 ZS5oOgorCiAyMDE0LTAyLTA3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmVydCByMTU0Mzg0IGFuZCByMTU0Njc0IGFzIHRoZXkgYnJva2Ugc2VsZWN0aW9u IHJlY3QgY29tcHV0YXRpb25zIGZvciB0ZXh0IHdpdGggbGlnYXR1cmVzLgpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3Bw CShyZXZpc2lvbiAxNjM2MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TZXJpYWxp emVkU2NyaXB0VmFsdWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTQwLDEyICsyNTQwLDYgQEAg UGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IFNlcmlhbAogICAgIHJldHVybiBhZG9w dFJlZihuZXcgU2VyaWFsaXplZFNjcmlwdFZhbHVlKGJ1ZmZlciwgYmxvYlVSTHMsIGFycmF5QnVm ZmVyQ29udGVudHNBcnJheS5yZWxlYXNlKCkpKTsKIH0KIAotUGFzc1JlZlB0cjxTZXJpYWxpemVk U2NyaXB0VmFsdWU+IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKCkKLXsKLSAgICBWZWN0 b3I8dWludDhfdD4gYnVmZmVyOwotICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXplZFNj cmlwdFZhbHVlKGJ1ZmZlcikpOwotfQotCiBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUoY29uc3QgU3RyaW5nJiBzdHJpbmcpCiB7 CiAgICAgVmVjdG9yPHVpbnQ4X3Q+IGJ1ZmZlcjsKQEAgLTI1NTUsMTEgKzI1NDksNiBAQCBQYXNz UmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsCiB9CiAKICNpZiBFTkFCTEUoSU5E RVhFRF9EQVRBQkFTRSkKLVBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxp emVkU2NyaXB0VmFsdWU6OmNyZWF0ZShKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpKU1ZhbHVl IHZhbHVlKQotewotICAgIHJldHVybiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZShleGVj LCB2YWx1ZSwgMCwgMCk7Ci19Ci0KIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBT ZXJpYWxpemVkU2NyaXB0VmFsdWU6Om51bWJlclZhbHVlKGRvdWJsZSB2YWx1ZSkKIHsKICAgICBW ZWN0b3I8dWludDhfdD4gYnVmZmVyOwpAQCAtMjU2Nyw5ICsyNTU2LDExIEBAIFBhc3NSZWZQdHI8 U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWwKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNl cmlhbGl6ZWRTY3JpcHRWYWx1ZShidWZmZXIpKTsKIH0KIAotSlNWYWx1ZSBTZXJpYWxpemVkU2Ny aXB0VmFsdWU6OmRlc2VyaWFsaXplKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0M6OkpTR2xvYmFs T2JqZWN0KiBnbG9iYWxPYmplY3QpCitQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4g U2VyaWFsaXplZFNjcmlwdFZhbHVlOjp1bmRlZmluZWRWYWx1ZSgpCiB7Ci0gICAgcmV0dXJuIGRl c2VyaWFsaXplKGV4ZWMsIGdsb2JhbE9iamVjdCwgMCk7CisgICAgVmVjdG9yPHVpbnQ4X3Q+IGJ1 ZmZlcjsKKyAgICBDbG9uZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZVVuZGVmaW5lZChidWZmZXIpOwor ICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXplZFNjcmlwdFZhbHVlKGJ1ZmZlcikpOwog fQogI2VuZGlmCiAKQEAgLTI2MTIsMTQgKzI2MDMsNiBAQCBKU1ZhbHVlIFNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZTo6ZGVzZXJpYWxpCiAgICAgcmV0dXJuIHJlc3VsdC5maXJzdDsKIH0KIAotI2lmIEVO QUJMRShJTlNQRUNUT1IpCi1EZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSBTZXJpYWxpemVkU2NyaXB0 VmFsdWU6OmRlc2VyaWFsaXplRm9ySW5zcGVjdG9yKEpTQzo6RXhlY1N0YXRlKiBzY3JpcHRTdGF0 ZSkKLXsKLSAgICBKU1ZhbHVlIHZhbHVlID0gZGVzZXJpYWxpemUoc2NyaXB0U3RhdGUsIHNjcmlw dFN0YXRlLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIDApOwotICAgIHJldHVybiBEZXByZWNhdGVk OjpTY3JpcHRWYWx1ZShzY3JpcHRTdGF0ZS0+dm0oKSwgdmFsdWUpOwotfQotI2VuZGlmCi0KIEpT VmFsdWVSZWYgU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZShKU0NvbnRleHRSZWYg ZGVzdGluYXRpb25Db250ZXh0LCBKU1ZhbHVlUmVmKiBleGNlcHRpb24sIE1lc3NhZ2VQb3J0QXJy YXkqIG1lc3NhZ2VQb3J0cykKIHsKICAgICBFeGVjU3RhdGUqIGV4ZWMgPSB0b0pTKGRlc3RpbmF0 aW9uQ29udGV4dCk7CkBAIC0yNjQzLDEzICsyNjI2LDcgQEAgSlNWYWx1ZVJlZiBTZXJpYWxpemVk U2NyaXB0VmFsdWU6OmRlc2VyaQogCiBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4g U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpudWxsVmFsdWUoKQogewotICAgIHJldHVybiBTZXJpYWxp emVkU2NyaXB0VmFsdWU6OmNyZWF0ZSgpOwotfQotCi1QYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjp1bmRlZmluZWRWYWx1ZSgpCi17CiAgICAg VmVjdG9yPHVpbnQ4X3Q+IGJ1ZmZlcjsKLSAgICBDbG9uZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZVVu ZGVmaW5lZChidWZmZXIpOwogICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXplZFNjcmlw dFZhbHVlKGJ1ZmZlcikpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9T ZXJpYWxpemVkU2NyaXB0VmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAkocmV2aXNpb24gMTYzNjMzKQorKysgU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTc3LDkgKzc3LDcgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZShidWZmZXIpKTsKICAgICB9CiAKLSAgICBzdGF0aWMg UGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IGNyZWF0ZSgpOwogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gbnVsbFZhbHVlKCk7Ci0gICAgc3RhdGlj IFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiB1bmRlZmluZWRWYWx1ZSgpOwogICAg IHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gYm9vbGVhblZhbHVlKGJv b2wgdmFsdWUpOwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVl PiBzZXJpYWxpemUoY29uc3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmLCBKU0M6OkV4ZWNTdGF0 ZSosIFNlcmlhbGl6YXRpb25FcnJvck1vZGUgPSBUaHJvd2luZyk7CkBAIC05NCwxNyArOTIsMTMg QEAgcHVibGljOgogICAgIEpTVmFsdWVSZWYgZGVzZXJpYWxpemUoSlNDb250ZXh0UmVmLCBKU1Zh bHVlUmVmKiBleGNlcHRpb24sIE1lc3NhZ2VQb3J0QXJyYXkqKTsKICAgICBKU1ZhbHVlUmVmIGRl c2VyaWFsaXplKEpTQ29udGV4dFJlZiwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKTsKIAotI2lmIEVO QUJMRShJTlNQRUNUT1IpCi0gICAgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUgZGVzZXJpYWxpemVG b3JJbnNwZWN0b3IoSlNDOjpFeGVjU3RhdGUqKTsKLSNlbmRpZgotCiAgICAgY29uc3QgVmVjdG9y PHVpbnQ4X3Q+JiBkYXRhKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhOyB9CiAgICAgY29uc3QgVmVj dG9yPFN0cmluZz4mIGJsb2JVUkxzKCkgY29uc3QgeyByZXR1cm4gbV9ibG9iVVJMczsgfQogCiAj aWYgRU5BQkxFKElOREVYRURfREFUQUJBU0UpCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8U2VyaWFs aXplZFNjcmlwdFZhbHVlPiBjcmVhdGUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUpOwor ICAgIC8vIEZJWE1FOiBHZXQgcmlkIG9mIHRoZXNlLiBUaGUgb25seSBjYWxsZXIgaW1tZWRpYXRl bHkgZGVzZXJpYWxpemVzIHRoZSByZXN1bHQsIHNvIGl0J3MgYSB2ZXJ5IHJvdW5kYWJvdXQgd2F5 IHRvIGNyZWF0ZSBhIEpTVmFsdWUuCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNj cmlwdFZhbHVlPiBudW1iZXJWYWx1ZShkb3VibGUgdmFsdWUpOwotICAgIEpTQzo6SlNWYWx1ZSBk ZXNlcmlhbGl6ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNHbG9iYWxPYmplY3QqKTsKKyAgICBz dGF0aWMgUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHVuZGVmaW5lZFZhbHVlKCk7 CiAjZW5kaWYKIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4g Y3JlYXRlRnJvbVdpcmVCeXRlcyhjb25zdCBWZWN0b3I8dWludDhfdD4mIGRhdGEpCg== 223589 2014-02-08 15:29:32 -0800 2014-02-08 17:16:36 -0800 part 2 Remove2.txt text/plain 8683 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MzcyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAyLTA4ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzb21lIHVudXNl ZCBmdW5jdGlvbnMgZnJvbSBTZXJpYWxpemVkU2NyaXB0VmFsdWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODQwNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgbW9yZSB1bnVzZWQgY29kZSwg cGFydGljdWxhcmx5IGluIEFQSSBoZWxwZXJzLiBSZW5hbWVkIG9uZSBzZXJpYWxpemUoKQorICAg ICAgICBmdW5jdGlvbiB0byBjcmVhdGUoKSwgYmVjYXVzZSBpdCBkb2VzIHRoZSBzYW1lIHRoaW5n IGFzIG90aGVyIGNyZWF0ZSgpIGZ1bmN0aW9ucy4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhl ZGRiL0lEQk9iamVjdFN0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQk9iamVjdFN0b3Jl OjpwdXQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaWFsaXplKToKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaDoKKwogMjAxNC0wMi0wOCAg QW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVudXNl ZCBDaHJvbWVDbGllbnQ6OmxheW91dFVwZGF0ZWQoKS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAJKHJldmlzaW9uIDE2 MzcyNikKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3Jl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ1LDcgKzE0NSw3IEBAIFBhc3NSZWZQdHI8SURCUmVx dWVzdD4gSURCT2JqZWN0U3RvcmU6OnAKIAogICAgIC8vIEZJWE1FOiBFeHBvc2UgdGhlIEpTIGVu Z2luZSBleGNlcHRpb24gc3RhdGUgdGhyb3VnaCBTY3JpcHRTdGF0ZS4KICAgICBib29sIGRpZFRo cm93ID0gZmFsc2U7Ci0gICAgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gc2VyaWFsaXpl ZFZhbHVlID0gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpzZXJpYWxpemUodmFsdWUsIHN0YXRlLCBu dWxscHRyLCBudWxscHRyLCBkaWRUaHJvdyk7CisgICAgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZT4gc2VyaWFsaXplZFZhbHVlID0gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUodmFs dWUsIHN0YXRlLCBudWxscHRyLCBudWxscHRyLCBkaWRUaHJvdyk7CiAgICAgaWYgKGRpZFRocm93 KSB7CiAgICAgICAgIC8vIFNldHRpbmcgYW4gZXhwbGljaXQgRXhjZXB0aW9uQ29kZSBoZXJlIHdv dWxkIGRlZmVyIGhhbmRsaW5nIHRoZSBhbHJlYWR5IHRocm93biBleGNlcHRpb24uCiAgICAgICAg IHJldHVybiAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2VyaWFsaXplZFNj cmlwdFZhbHVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9T ZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCShyZXZpc2lvbiAxNjM3MjYpCisrKyBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yNTY0LDE0ICsyNTY0LDEyIEBAIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVl PiBTZXJpYWwKIH0KICNlbmRpZgogCi1QYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4g U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUoSlNDb250ZXh0UmVmIG9yaWdpbkNvbnRleHQs IEpTVmFsdWVSZWYgYXBpVmFsdWUsIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1lc3NhZ2VQb3J0QXJyYXkqIG1lc3NhZ2VQ b3J0cywgQXJyYXlCdWZmZXJBcnJheSogYXJyYXlCdWZmZXJzLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEpTVmFsdWVSZWYq IGV4Y2VwdGlvbikKK1Bhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxpemVk U2NyaXB0VmFsdWU6OmNyZWF0ZShKU0NvbnRleHRSZWYgb3JpZ2luQ29udGV4dCwgSlNWYWx1ZVJl ZiBhcGlWYWx1ZSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQogewogICAgIEV4ZWNTdGF0ZSogZXhl YyA9IHRvSlMob3JpZ2luQ29udGV4dCk7CiAgICAgQVBJRW50cnlTaGltIGVudHJ5U2hpbShleGVj KTsKICAgICBKU1ZhbHVlIHZhbHVlID0gdG9KUyhleGVjLCBhcGlWYWx1ZSk7Ci0gICAgUmVmUHRy PFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gc2VyaWFsaXplZFZhbHVlID0gU2VyaWFsaXplZFNjcmlw dFZhbHVlOjpjcmVhdGUoZXhlYywgdmFsdWUsIG1lc3NhZ2VQb3J0cywgYXJyYXlCdWZmZXJzKTsK KyAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBzZXJpYWxpemVkVmFsdWUgPSBTZXJp YWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZShleGVjLCB2YWx1ZSwgbnVsbHB0ciwgbnVsbHB0cik7 CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKSB7CiAgICAgICAgIGlmIChleGNlcHRpb24p CiAgICAgICAgICAgICAqZXhjZXB0aW9uID0gdG9SZWYoZXhlYywgZXhlYy0+ZXhjZXB0aW9uKCkp OwpAQCAtMjU4MiwxMiArMjU4MCw2IEBAIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVl PiBTZXJpYWwKICAgICByZXR1cm4gc2VyaWFsaXplZFZhbHVlLnJlbGVhc2UoKTsKIH0KIAotUGFz c1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3Jl YXRlKEpTQ29udGV4dFJlZiBvcmlnaW5Db250ZXh0LCBKU1ZhbHVlUmVmIGFwaVZhbHVlLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKLXsKLSAgICByZXR1cm4gY3JlYXRlKG9yaWdpbkNv bnRleHQsIGFwaVZhbHVlLCAwLCAwLCBleGNlcHRpb24pOwotfQotCiBTdHJpbmcgU2VyaWFsaXpl ZFNjcmlwdFZhbHVlOjp0b1N0cmluZygpCiB7CiAgICAgcmV0dXJuIENsb25lRGVzZXJpYWxpemVy OjpkZXNlcmlhbGl6ZVN0cmluZyhtX2RhdGEpOwpAQCAtMjYwMywxMSArMjU5NSwxMSBAQCBKU1Zh bHVlIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJpYWxpCiAgICAgcmV0dXJuIHJlc3VsdC5m aXJzdDsKIH0KIAotSlNWYWx1ZVJlZiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaWFsaXpl KEpTQ29udGV4dFJlZiBkZXN0aW5hdGlvbkNvbnRleHQsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbiwg TWVzc2FnZVBvcnRBcnJheSogbWVzc2FnZVBvcnRzKQorSlNWYWx1ZVJlZiBTZXJpYWxpemVkU2Ny aXB0VmFsdWU6OmRlc2VyaWFsaXplKEpTQ29udGV4dFJlZiBkZXN0aW5hdGlvbkNvbnRleHQsIEpT VmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKICAgICBFeGVjU3RhdGUqIGV4ZWMgPSB0b0pTKGRlc3Rp bmF0aW9uQ29udGV4dCk7CiAgICAgQVBJRW50cnlTaGltIGVudHJ5U2hpbShleGVjKTsKLSAgICBK U1ZhbHVlIHZhbHVlID0gZGVzZXJpYWxpemUoZXhlYywgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVj dCgpLCBtZXNzYWdlUG9ydHMpOworICAgIEpTVmFsdWUgdmFsdWUgPSBkZXNlcmlhbGl6ZShleGVj LCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIG51bGxwdHIpOwogICAgIGlmIChleGVjLT5o YWRFeGNlcHRpb24oKSkgewogICAgICAgICBpZiAoZXhjZXB0aW9uKQogICAgICAgICAgICAgKmV4 Y2VwdGlvbiA9IHRvUmVmKGV4ZWMsIGV4ZWMtPmV4Y2VwdGlvbigpKTsKQEAgLTI2MTgsMzEgKzI2 MTAsMTMgQEAgSlNWYWx1ZVJlZiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaQogICAgIHJl dHVybiB0b1JlZihleGVjLCB2YWx1ZSk7CiB9CiAKLQotSlNWYWx1ZVJlZiBTZXJpYWxpemVkU2Ny aXB0VmFsdWU6OmRlc2VyaWFsaXplKEpTQ29udGV4dFJlZiBkZXN0aW5hdGlvbkNvbnRleHQsIEpT VmFsdWVSZWYqIGV4Y2VwdGlvbikKLXsKLSAgICByZXR1cm4gZGVzZXJpYWxpemUoZGVzdGluYXRp b25Db250ZXh0LCBleGNlcHRpb24sIDApOwotfQotCiBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpudWxsVmFsdWUoKQogewogICAgIFZlY3Rv cjx1aW50OF90PiBidWZmZXI7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTZXJpYWxpemVkU2Ny aXB0VmFsdWUoYnVmZmVyKSk7CiB9CiAKLVBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVl PiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmJvb2xlYW5WYWx1ZShib29sIHZhbHVlKQotewotICAg IFZlY3Rvcjx1aW50OF90PiBidWZmZXI7Ci0gICAgQ2xvbmVTZXJpYWxpemVyOjpzZXJpYWxpemVC b29sZWFuKHZhbHVlLCBidWZmZXIpOwotICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXpl ZFNjcmlwdFZhbHVlKGJ1ZmZlcikpOwotfQotCi1QYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpzZXJpYWxpemUoY29uc3QgRGVwcmVjYXRlZDo6 U2NyaXB0VmFsdWUmIHZhbHVlLCBKU0M6OkV4ZWNTdGF0ZSogc2NyaXB0U3RhdGUsIFNlcmlhbGl6 YXRpb25FcnJvck1vZGUgdGhyb3dFeGNlcHRpb25zKQotewotICAgIHJldHVybiBTZXJpYWxpemVk U2NyaXB0VmFsdWU6OmNyZWF0ZShzY3JpcHRTdGF0ZSwgdmFsdWUuanNWYWx1ZSgpLCBudWxscHRy LCBudWxscHRyLCB0aHJvd0V4Y2VwdGlvbnMpOwotfQotCi1QYXNzUmVmUHRyPFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpzZXJpYWxpemUoY29uc3QgRGVwcmVj YXRlZDo6U2NyaXB0VmFsdWUmIHZhbHVlLCBKU0M6OkV4ZWNTdGF0ZSogc2NyaXB0U3RhdGUsIE1l c3NhZ2VQb3J0QXJyYXkqIG1lc3NhZ2VQb3J0cywgQXJyYXlCdWZmZXJBcnJheSogYXJyYXlCdWZm ZXJzLCBib29sJiBkaWRUaHJvdykKK1Bhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBT ZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZShjb25zdCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1 ZSYgdmFsdWUsIEpTQzo6RXhlY1N0YXRlKiBzY3JpcHRTdGF0ZSwgTWVzc2FnZVBvcnRBcnJheSog bWVzc2FnZVBvcnRzLCBBcnJheUJ1ZmZlckFycmF5KiBhcnJheUJ1ZmZlcnMsIGJvb2wmIGRpZFRo cm93KQogewogICAgIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHNlcmlhbGl6ZWRWYWx1 ZSA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKHNjcmlwdFN0YXRlLCB2YWx1ZS5qc1Zh bHVlKCksIG1lc3NhZ2VQb3J0cywgYXJyYXlCdWZmZXJzKTsKICAgICBkaWRUaHJvdyA9IHNjcmlw dFN0YXRlLT5oYWRFeGNlcHRpb24oKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCShyZXZpc2lvbiAxNjM3MjYpCisrKyBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAkod29ya2lu ZyBjb3B5KQpAQCAtNjgsOCArNjgsNiBAQCBjbGFzcyBTZXJpYWxpemVkU2NyaXB0VmFsdWUgOgog I2VuZGlmCiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZh bHVlPiBjcmVhdGUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIE1lc3NhZ2VQb3J0QXJy YXkqLCBBcnJheUJ1ZmZlckFycmF5KiwgU2VyaWFsaXphdGlvbkVycm9yTW9kZSA9IFRocm93aW5n KTsKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IGNyZWF0ZShK U0NvbnRleHRSZWYsIEpTVmFsdWVSZWYsIE1lc3NhZ2VQb3J0QXJyYXkqLCBBcnJheUJ1ZmZlckFy cmF5KiwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKTsKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZXJp YWxpemVkU2NyaXB0VmFsdWU+IGNyZWF0ZShKU0NvbnRleHRSZWYsIEpTVmFsdWVSZWYsIEpTVmFs dWVSZWYqIGV4Y2VwdGlvbik7CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZXJpYWxpemVkU2Ny aXB0VmFsdWU+IGNyZWF0ZShjb25zdCBTdHJpbmcmKTsKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxT ZXJpYWxpemVkU2NyaXB0VmFsdWU+IGFkb3B0KFZlY3Rvcjx1aW50OF90PiYgYnVmZmVyKQpAQCAt NzgsMTggKzc2LDE4IEBAIHB1YmxpYzoKICAgICB9CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxT ZXJpYWxpemVkU2NyaXB0VmFsdWU+IG51bGxWYWx1ZSgpOwotICAgIHN0YXRpYyBQYXNzUmVmUHRy PFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gYm9vbGVhblZhbHVlKGJvb2wgdmFsdWUpOwogCi0gICAg c3RhdGljIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBzZXJpYWxpemUoY29uc3Qg RGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmLCBKU0M6OkV4ZWNTdGF0ZSosIFNlcmlhbGl6YXRpb25F cnJvck1vZGUgPSBUaHJvd2luZyk7Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNj cmlwdFZhbHVlPiBzZXJpYWxpemUoY29uc3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmLCBKU0M6 OkV4ZWNTdGF0ZSosIE1lc3NhZ2VQb3J0QXJyYXkqLCBBcnJheUJ1ZmZlckFycmF5KiwgYm9vbCYp OworICAgIEpTQzo6SlNWYWx1ZSBkZXNlcmlhbGl6ZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNH bG9iYWxPYmplY3QqLCBNZXNzYWdlUG9ydEFycmF5KiwgU2VyaWFsaXphdGlvbkVycm9yTW9kZSA9 IFRocm93aW5nKTsKKworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZT4gY3JlYXRlKGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJiwgSlNDOjpFeGVjU3RhdGUq LCBNZXNzYWdlUG9ydEFycmF5KiwgQXJyYXlCdWZmZXJBcnJheSosIGJvb2wmIGRpZFRocm93KTsK ICAgICBzdGF0aWMgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUgZGVzZXJpYWxpemUoSlNDOjpFeGVj U3RhdGUqLCBTZXJpYWxpemVkU2NyaXB0VmFsdWUqLCBTZXJpYWxpemF0aW9uRXJyb3JNb2RlID0g VGhyb3dpbmcpOwogCiAgICAgc3RhdGljIHVpbnQzMl90IHdpcmVGb3JtYXRWZXJzaW9uKCk7CiAK ICAgICBTdHJpbmcgdG9TdHJpbmcoKTsKLSAgICAKLSAgICBKU0M6OkpTVmFsdWUgZGVzZXJpYWxp emUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTR2xvYmFsT2JqZWN0KiwgTWVzc2FnZVBvcnRBcnJh eSosIFNlcmlhbGl6YXRpb25FcnJvck1vZGUgPSBUaHJvd2luZyk7Ci0gICAgSlNWYWx1ZVJlZiBk ZXNlcmlhbGl6ZShKU0NvbnRleHRSZWYsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbiwgTWVzc2FnZVBv cnRBcnJheSopOworCisgICAgLy8gQVBJIGltcGxlbWVudGF0aW9uIGhlbHBlcnMuIFRoZXNlIGRv bid0IGV4cG9zZSBzcGVjaWFsIGJlaGF2aW9yIGZvciBBcnJheUJ1ZmZlcnMgb3IgTWVzc2FnZVBv cnRzLgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gY3JlYXRl KEpTQ29udGV4dFJlZiwgSlNWYWx1ZVJlZiwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKTsKICAgICBK U1ZhbHVlUmVmIGRlc2VyaWFsaXplKEpTQ29udGV4dFJlZiwgSlNWYWx1ZVJlZiogZXhjZXB0aW9u KTsKIAogICAgIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgZGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1f ZGF0YTsgfQpAQCAtMTE5LDYgKzExNyw3IEBAIHByaXZhdGU6CiAgICAgU2VyaWFsaXplZFNjcmlw dFZhbHVlKFZlY3Rvcjx1bnNpZ25lZCBjaGFyPiYpOwogICAgIFNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZShWZWN0b3I8dW5zaWduZWQgY2hhcj4mLCBWZWN0b3I8U3RyaW5nPiYgYmxvYlVSTHMpOwogICAg IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZShWZWN0b3I8dW5zaWduZWQgY2hhcj4mLCBWZWN0b3I8U3Ry aW5nPiYgYmxvYlVSTHMsIFBhc3NPd25QdHI8QXJyYXlCdWZmZXJDb250ZW50c0FycmF5Pik7CisK ICAgICBWZWN0b3I8dW5zaWduZWQgY2hhcj4gbV9kYXRhOwogICAgIE93blB0cjxBcnJheUJ1ZmZl ckNvbnRlbnRzQXJyYXk+IG1fYXJyYXlCdWZmZXJDb250ZW50c0FycmF5OwogICAgIFZlY3RvcjxT dHJpbmc+IG1fYmxvYlVSTHM7Cg== 223737 2014-02-10 13:18:31 -0800 2014-02-10 13:19:01 -0800 part 3 Remove3.txt text/plain 7729 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MzgwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAyLTEwICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzb21lIHVudXNl ZCBmdW5jdGlvbnMgZnJvbSBTZXJpYWxpemVkU2NyaXB0VmFsdWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODQwNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgZnVuY3Rpb25zIHRoYXQgdXNl ZCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZQorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIv SURCT2JqZWN0U3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCT2JqZWN0U3RvcmU6OnB1 dCk6CisgICAgICAgICogYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpkZXNlcmlhbGl6ZUlEQlZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OmRl c2VyaWFsaXplSURCVmFsdWVCdWZmZXIpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZS5jcHA6CisgICAgICAgICogYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlw dFZhbHVlLmg6CisKIDIwMTQtMDItMTAgIFJvZ2VyIEZvbmcgIDxyb2dlcl9mb25nQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2luZG93c10gVW5yZXZpZXdlZCB0ZXN0IGZpeC4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9iamVjdFN0b3JlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPYmplY3RTdG9yZS5jcHAJ KHJldmlzaW9uIDE2Mzc5MCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE Qk9iamVjdFN0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMyLDI5ICsxMzIsMjUgQEAgUGFz c1JlZlB0cjxJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6cAogICAgIFJlZlB0cjxJREJLZXk+ IGtleSA9IHBycEtleTsKICAgICBpZiAobV9kZWxldGVkKSB7CiAgICAgICAgIGVjID0gSURCRGF0 YWJhc2VFeGNlcHRpb246OkludmFsaWRTdGF0ZUVycm9yOwotICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogICAgIGlmICghbV90cmFuc2FjdGlvbi0+aXNB Y3RpdmUoKSkgewogICAgICAgICBlYyA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpUcmFuc2FjdGlv bkluYWN0aXZlRXJyb3I7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICB9CiAgICAgaWYgKG1fdHJhbnNhY3Rpb24tPmlzUmVhZE9ubHkoKSkgewogICAgICAg ICBlYyA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpSZWFkT25seUVycm9yOwotICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgLy8gRklYTUU6IEV4 cG9zZSB0aGUgSlMgZW5naW5lIGV4Y2VwdGlvbiBzdGF0ZSB0aHJvdWdoIFNjcmlwdFN0YXRlLgot ICAgIGJvb2wgZGlkVGhyb3cgPSBmYWxzZTsKLSAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZh bHVlPiBzZXJpYWxpemVkVmFsdWUgPSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZSh2YWx1 ZSwgc3RhdGUsIG51bGxwdHIsIG51bGxwdHIsIGRpZFRocm93KTsKLSAgICBpZiAoZGlkVGhyb3cp IHsKLSAgICAgICAgLy8gU2V0dGluZyBhbiBleHBsaWNpdCBFeGNlcHRpb25Db2RlIGhlcmUgd291 bGQgZGVmZXIgaGFuZGxpbmcgdGhlIGFscmVhZHkgdGhyb3duIGV4Y2VwdGlvbi4KLSAgICAgICAg cmV0dXJuIDA7Ci0gICAgfQorICAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBzZXJp YWxpemVkVmFsdWUgPSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZShzdGF0ZSwgdmFsdWUu anNWYWx1ZSgpLCBudWxscHRyLCBudWxscHRyKTsKKyAgICAgaWYgKHN0YXRlLT5oYWRFeGNlcHRp b24oKSkKKyAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKHNlcmlhbGl6ZWRWYWx1 ZS0+YmxvYlVSTHMoKS5zaXplKCkgPiAwKSB7CiAgICAgICAgIC8vIEZJWE1FOiBBZGQgQmxvYi9G aWxlL0ZpbGVMaXN0IHN1cHBvcnQKICAgICAgICAgZWMgPSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6 RGF0YUNsb25lRXJyb3I7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICB9CiAKICAgICBjb25zdCBJREJLZXlQYXRoJiBrZXlQYXRoID0gbV9tZXRhZGF0YS5r ZXlQYXRoOwpAQCAtMTY2LDI2ICsxNjIsMjYgQEAgUGFzc1JlZlB0cjxJREJSZXF1ZXN0PiBJREJP YmplY3RTdG9yZTo6cAogCiAgICAgaWYgKHB1dE1vZGUgIT0gSURCRGF0YWJhc2VCYWNrZW5kOjpD dXJzb3JVcGRhdGUgJiYgdXNlc0luTGluZUtleXMgJiYga2V5KSB7CiAgICAgICAgIGVjID0gSURC RGF0YWJhc2VFeGNlcHRpb246OkRhdGFFcnJvcjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAg IHJldHVybiBudWxscHRyOwogICAgIH0KICAgICBpZiAoIXVzZXNJbkxpbmVLZXlzICYmICFoYXNL ZXlHZW5lcmF0b3IgJiYgIWtleSkgewogICAgICAgICBlYyA9IElEQkRhdGFiYXNlRXhjZXB0aW9u OjpEYXRhRXJyb3I7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsK ICAgICB9CiAgICAgaWYgKHVzZXNJbkxpbmVLZXlzKSB7CiAgICAgICAgIFJlZlB0cjxJREJLZXk+ IGtleVBhdGhLZXkgPSBjcmVhdGVJREJLZXlGcm9tU2NyaXB0VmFsdWVBbmRLZXlQYXRoKHJlcXVl c3RTdGF0ZS5leGVjKCksIHZhbHVlLCBrZXlQYXRoKTsKICAgICAgICAgaWYgKGtleVBhdGhLZXkg JiYgIWtleVBhdGhLZXktPmlzVmFsaWQoKSkgewogICAgICAgICAgICAgZWMgPSBJREJEYXRhYmFz ZUV4Y2VwdGlvbjo6RGF0YUVycm9yOwotICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAg ICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgfQogICAgICAgICBpZiAoIWhhc0tleUdlbmVyYXRv ciAmJiAha2V5UGF0aEtleSkgewogICAgICAgICAgICAgZWMgPSBJREJEYXRhYmFzZUV4Y2VwdGlv bjo6RGF0YUVycm9yOwotICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICByZXR1cm4g bnVsbHB0cjsKICAgICAgICAgfQogICAgICAgICBpZiAoaGFzS2V5R2VuZXJhdG9yICYmICFrZXlQ YXRoS2V5KSB7CiAgICAgICAgICAgICBpZiAoIWNhbkluamVjdElEQktleUludG9TY3JpcHRWYWx1 ZSgmcmVxdWVzdFN0YXRlLCB2YWx1ZSwga2V5UGF0aCkpIHsKICAgICAgICAgICAgICAgICBlYyA9 IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpEYXRhRXJyb3I7Ci0gICAgICAgICAgICAgICAgcmV0dXJu IDA7CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KICAgICAgICAgaWYgKGtleVBhdGhLZXkpCkBAIC0xOTMsNyArMTg5LDcgQEAgUGFzc1Jl ZlB0cjxJREJSZXF1ZXN0PiBJREJPYmplY3RTdG9yZTo6cAogICAgIH0KICAgICBpZiAoa2V5ICYm ICFrZXktPmlzVmFsaWQoKSkgewogICAgICAgICBlYyA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpE YXRhRXJyb3I7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICB9CiAKICAgICBWZWN0b3I8aW50NjRfdD4gaW5kZXhJZHM7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmNwcAkocmV2aXNpb24g MTYzNzkwKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGll cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5OSw5ICsyOTksMTIgQEAgRGVwcmVjYXRlZDo6U2Ny aXB0VmFsdWUgZGVzZXJpYWxpemVJREJWYQogewogICAgIEV4ZWNTdGF0ZSogZXhlYyA9IHJlcXVl c3RTdGF0ZS0+ZXhlYygpOwogICAgIFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHNlcmlh bGl6ZWRWYWx1ZSA9IHBycFZhbHVlOworICAgIEpTVmFsdWUgcmVzdWx0OwogICAgIGlmIChzZXJp YWxpemVkVmFsdWUpCi0gICAgICAgIHJldHVybiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2Vy aWFsaXplKGV4ZWMsIHNlcmlhbGl6ZWRWYWx1ZS5nZXQoKSwgTm9uVGhyb3dpbmcpOwotICAgIHJl dHVybiBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZShleGVjLT52bSgpLCBqc051bGwoKSk7CisgICAg ICAgIHJlc3VsdCA9IHNlcmlhbGl6ZWRWYWx1ZS0+ZGVzZXJpYWxpemUoZXhlYywgZXhlYy0+bGV4 aWNhbEdsb2JhbE9iamVjdCgpLCAwKTsKKyAgICBlbHNlCisgICAgICAgIHJlc3VsdCA9IGpzTnVs bCgpOworICAgIHJldHVybiBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZShleGVjLT52bSgpLCByZXN1 bHQpOwogfQogCiBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSBkZXNlcmlhbGl6ZUlEQlZhbHVlQnVm ZmVyKERPTVJlcXVlc3RTdGF0ZSogcmVxdWVzdFN0YXRlLCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZl cj4gcHJwQnVmZmVyLCBib29sIGtleUlzRGVmaW5lZCkKQEAgLTMyNCwxMiArMzI3LDE1IEBAIERl cHJlY2F0ZWQ6OlNjcmlwdFZhbHVlIGRlc2VyaWFsaXplSURCVmEKICAgICAgICAgcmV0dXJuIERl cHJlY2F0ZWQ6OlNjcmlwdFZhbHVlKGV4ZWMtPnZtKCksIGpzVW5kZWZpbmVkKCkpOwogICAgIH0K IAorICAgIEpTVmFsdWUgcmVzdWx0OwogICAgIGlmIChidWZmZXIuc2l6ZSgpKSB7CiAgICAgICAg IFJlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHNlcmlhbGl6ZWRWYWx1ZSA9IFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlRnJvbVdpcmVCeXRlcyhidWZmZXIpOwotICAgICAgICByZXR1 cm4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZShleGVjLCBzZXJpYWxpemVkVmFs dWUuZ2V0KCksIE5vblRocm93aW5nKTsKKyAgICAgICAgcmVzdWx0ID0gc2VyaWFsaXplZFZhbHVl LT5kZXNlcmlhbGl6ZShleGVjLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIDAsIE5vblRo cm93aW5nKTsKICAgICB9CisgICAgZWxzZQorICAgICAgICByZXN1bHQgPSBqc051bGwoKTsKIAot ICAgIHJldHVybiBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZShleGVjLT52bSgpLCBqc051bGwoKSk7 CisgICAgcmV0dXJuIERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlKGV4ZWMtPnZtKCksIHJlc3VsdCk7 CiB9CiAKIERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlIGlkYktleVRvU2NyaXB0VmFsdWUoRE9NUmVx dWVzdFN0YXRlKiByZXF1ZXN0U3RhdGUsIFBhc3NSZWZQdHI8SURCS2V5PiBrZXkpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1 ZS5jcHAJKHJldmlzaW9uIDE2Mzc5MCkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Nl cmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2MTYsMTggKzI2MTYs NiBAQCBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsCiAgICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBTZXJpYWxpemVkU2NyaXB0VmFsdWUoYnVmZmVyKSk7CiB9CiAKLVBhc3NS ZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0 ZShjb25zdCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSYgdmFsdWUsIEpTQzo6RXhlY1N0YXRlKiBz Y3JpcHRTdGF0ZSwgTWVzc2FnZVBvcnRBcnJheSogbWVzc2FnZVBvcnRzLCBBcnJheUJ1ZmZlckFy cmF5KiBhcnJheUJ1ZmZlcnMsIGJvb2wmIGRpZFRocm93KQotewotICAgIFJlZlB0cjxTZXJpYWxp emVkU2NyaXB0VmFsdWU+IHNlcmlhbGl6ZWRWYWx1ZSA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6 Y3JlYXRlKHNjcmlwdFN0YXRlLCB2YWx1ZS5qc1ZhbHVlKCksIG1lc3NhZ2VQb3J0cywgYXJyYXlC dWZmZXJzKTsKLSAgICBkaWRUaHJvdyA9IHNjcmlwdFN0YXRlLT5oYWRFeGNlcHRpb24oKTsKLSAg ICByZXR1cm4gc2VyaWFsaXplZFZhbHVlLnJlbGVhc2UoKTsKLX0KLQotRGVwcmVjYXRlZDo6U2Ny aXB0VmFsdWUgU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZShKU0M6OkV4ZWNTdGF0 ZSogc2NyaXB0U3RhdGUsIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogdmFsdWUsIFNlcmlhbGl6YXRp b25FcnJvck1vZGUgdGhyb3dFeGNlcHRpb25zKQotewotICAgIHJldHVybiBEZXByZWNhdGVkOjpT Y3JpcHRWYWx1ZShzY3JpcHRTdGF0ZS0+dm0oKSwgdmFsdWUtPmRlc2VyaWFsaXplKHNjcmlwdFN0 YXRlLCBzY3JpcHRTdGF0ZS0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLCAwLCB0aHJvd0V4Y2VwdGlv bnMpKTsKLX0KLQogdm9pZCBTZXJpYWxpemVkU2NyaXB0VmFsdWU6Om1heWJlVGhyb3dFeGNlcHRp b25JZlNlcmlhbGl6YXRpb25GYWlsZWQoRXhlY1N0YXRlKiBleGVjLCBTZXJpYWxpemF0aW9uUmV0 dXJuQ29kZSBjb2RlKQogewogICAgIGlmIChjb2RlID09IFN1Y2Nlc3NmdWxseUNvbXBsZXRlZCkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3Jp cHRWYWx1ZS5oCShyZXZpc2lvbiAxNjM3OTApCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAkod29ya2luZyBjb3B5KQpAQCAtNzksOSArNzksNiBA QCBwdWJsaWM6CiAKICAgICBKU0M6OkpTVmFsdWUgZGVzZXJpYWxpemUoSlNDOjpFeGVjU3RhdGUq LCBKU0M6OkpTR2xvYmFsT2JqZWN0KiwgTWVzc2FnZVBvcnRBcnJheSosIFNlcmlhbGl6YXRpb25F cnJvck1vZGUgPSBUaHJvd2luZyk7CiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZXJpYWxpemVk U2NyaXB0VmFsdWU+IGNyZWF0ZShjb25zdCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSYsIEpTQzo6 RXhlY1N0YXRlKiwgTWVzc2FnZVBvcnRBcnJheSosIEFycmF5QnVmZmVyQXJyYXkqLCBib29sJiBk aWRUaHJvdyk7Ci0gICAgc3RhdGljIERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlIGRlc2VyaWFsaXpl KEpTQzo6RXhlY1N0YXRlKiwgU2VyaWFsaXplZFNjcmlwdFZhbHVlKiwgU2VyaWFsaXphdGlvbkVy cm9yTW9kZSA9IFRocm93aW5nKTsKLQogICAgIHN0YXRpYyB1aW50MzJfdCB3aXJlRm9ybWF0VmVy c2lvbigpOwogCiAgICAgU3RyaW5nIHRvU3RyaW5nKCk7Cg==