121568 2013-09-18 13:28:39 -0700 Replace use of OwnArrayPtr<Foo> with std::unique_ptr<Foo[]> in WebKit and WebKit2 2013-09-18 15:25:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam cdumez commit-queue gyuyoung.kim rakuco oldest_to_newest 930722 0 sam 2013-09-18 13:28:39 -0700 Replace use of OwnArrayPtr<Foo> with std::unique_ptr<Foo[]> in WebKit and WebKit2 930723 1 212016 sam 2013-09-18 13:29:34 -0700 Created attachment 212016 Patch 930750 2 sam 2013-09-18 14:44:47 -0700 Committed r156063: <http://trac.webkit.org/changeset/156063> 930775 3 212016 bfulgham 2013-09-18 15:25:48 -0700 Comment on attachment 212016 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212016&action=review This change breaks the Windows build. > Source/WebKit/win/WebHistory.h:150 > + std::unique<DATE[]> m_orderedLastVisitedDays; Should this have been std::unique_ptr? Isn't std::unique an algorithm? 212016 2013-09-18 13:29:34 -0700 2013-09-18 15:25:48 -0700 Patch bug-121568-20130918132933.patch text/plain 15308 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjA1NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA5LTE4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVwbGFjZSB1c2Ugb2YgT3duQXJyYXlQ dHI8Rm9vPiB3aXRoIHN0ZDo6dW5pcXVlX3B0cjxGb29bXT4gaW4gV2ViS2l0IGFuZCBXZWJLaXQy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE1NjgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRm b3JtL0NvcmVJUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHA6CisgICAgICAgIChDb3JlSVBDOjpD b25uZWN0aW9uOjpwcm9jZXNzTWVzc2FnZSk6CisgICAgICAgIChDb3JlSVBDOjpyZWFkQnl0ZXNG cm9tU29ja2V0KToKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246OnNlbmRPdXRnb2luZ01l c3NhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwOgorICAgICAg ICAoRXdrVmlldzo6ZmVlZFRvdWNoRXZlbnQpOgorICAgICAgICAoRXdrVmlldzo6ZmVlZFRvdWNo RXZlbnRzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9TbmFwc2hvdEltYWdlR0wuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmlsZV9jaG9vc2VyX3JlcXVlc3QuY3Bw OgorICAgICAgICAoZXdrX2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0X2ZpbGVzX2Nob29zZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0xhdW5jaGVyL2VmbC9Qcm9jZXNzTGF1bmNoZXJFZmwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpjcmVhdGVBcmdzQXJyYXkpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNz TGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdLQnVuZGxlUGFnZUNvcHlD b250ZXh0TWVudUl0ZW1zKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0lu amVjdGVkQnVuZGxlLmNwcDoKKwogMjAxMy0wOS0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJz Y2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZlB0ckhhc2hNYXAgc2hvdWxkIHdvcmsgd2l0aCBt b3ZlIG9ubHkgdHlwZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5p eC9Db25uZWN0aW9uVW5peC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGxhdGZv cm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcAkocmV2aXNpb24gMTU2MDU2KQorKysg U291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzYsNyArMzYsNyBAQAogI2luY2x1ZGUgPGZjbnRsLmg+CiAjaW5j bHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbmNsdWRlIDx3dGYvRnVuY3Rpb25hbC5oPgotI2lu Y2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgorI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4K ICNpbmNsdWRlIDx3dGYvVW5pU3RkRXh0cmFzLmg+CiAKICNpZiBQTEFURk9STShRVCkKQEAgLTIx MywxMCArMjEzLDEwIEBAIGJvb2wgQ29ubmVjdGlvbjo6cHJvY2Vzc01lc3NhZ2UoKQogCiAgICAg c2l6ZV90IGF0dGFjaG1lbnRGaWxlRGVzY3JpcHRvckNvdW50ID0gMDsKICAgICBzaXplX3QgYXR0 YWNobWVudENvdW50ID0gbWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCk7Ci0gICAgT3duQXJy YXlQdHI8QXR0YWNobWVudEluZm8+IGF0dGFjaG1lbnRJbmZvOworICAgIHN0ZDo6dW5pcXVlX3B0 cjxBdHRhY2htZW50SW5mb1tdPiBhdHRhY2htZW50SW5mbzsKIAogICAgIGlmIChhdHRhY2htZW50 Q291bnQpIHsKLSAgICAgICAgYXR0YWNobWVudEluZm8gPSBhZG9wdEFycmF5UHRyKG5ldyBBdHRh Y2htZW50SW5mb1thdHRhY2htZW50Q291bnRdKTsKKyAgICAgICAgYXR0YWNobWVudEluZm8gPSBz dGQ6Om1ha2VfdW5pcXVlPEF0dGFjaG1lbnRJbmZvW10+KGF0dGFjaG1lbnRDb3VudCk7CiAgICAg ICAgIG1lbWNweShhdHRhY2htZW50SW5mby5nZXQoKSwgbWVzc2FnZURhdGEsIHNpemVvZihBdHRh Y2htZW50SW5mbykgKiBhdHRhY2htZW50Q291bnQpOwogICAgICAgICBtZXNzYWdlRGF0YSArPSBz aXplb2YoQXR0YWNobWVudEluZm8pICogYXR0YWNobWVudENvdW50OwogCkBAIC0zMjMsNyArMzIz LDcgQEAgc3RhdGljIHNzaXplX3QgcmVhZEJ5dGVzRnJvbVNvY2tldChpbnQgcwogICAgIG1lbXNl dCgmaW92LCAwLCBzaXplb2YoaW92KSk7CiAKICAgICBtZXNzYWdlLm1zZ19jb250cm9sbGVuID0g Q01TR19TUEFDRShzaXplb2YoaW50KSAqIGF0dGFjaG1lbnRNYXhBbW91bnQpOwotICAgIE93bkFy cmF5UHRyPGNoYXI+IGF0dGFjaG1lbnREZXNjcmlwdG9yQnVmZmVyID0gYWRvcHRBcnJheVB0cihu ZXcgY2hhclttZXNzYWdlLm1zZ19jb250cm9sbGVuXSk7CisgICAgYXV0byBhdHRhY2htZW50RGVz Y3JpcHRvckJ1ZmZlciA9IHN0ZDo6bWFrZV91bmlxdWU8Y2hhcltdPihtZXNzYWdlLm1zZ19jb250 cm9sbGVuKTsKICAgICBtZW1zZXQoYXR0YWNobWVudERlc2NyaXB0b3JCdWZmZXIuZ2V0KCksIDAs IG1lc3NhZ2UubXNnX2NvbnRyb2xsZW4pOwogICAgIG1lc3NhZ2UubXNnX2NvbnRyb2wgPSBhdHRh Y2htZW50RGVzY3JpcHRvckJ1ZmZlci5nZXQoKTsKIApAQCAtNDkxLDcgKzQ5MSw3IEBAIGJvb2wg Q29ubmVjdGlvbjo6c2VuZE91dGdvaW5nTWVzc2FnZShPd24KICAgICBpb3ZbMF0uaW92X2Jhc2Ug PSByZWludGVycHJldF9jYXN0PHZvaWQqPigmbWVzc2FnZUluZm8pOwogICAgIGlvdlswXS5pb3Zf bGVuID0gc2l6ZW9mKG1lc3NhZ2VJbmZvKTsKIAotICAgIE93bkFycmF5UHRyPEF0dGFjaG1lbnRJ bmZvPiBhdHRhY2htZW50SW5mbyA9IGFkb3B0QXJyYXlQdHIobmV3IEF0dGFjaG1lbnRJbmZvW2F0 dGFjaG1lbnRzLnNpemUoKV0pOworICAgIGF1dG8gYXR0YWNobWVudEluZm8gPSBzdGQ6Om1ha2Vf dW5pcXVlPEF0dGFjaG1lbnRJbmZvW10+KGF0dGFjaG1lbnRzLnNpemUoKSk7CiAKICAgICBzaXpl X3QgYXR0YWNobWVudEZEQnVmZmVyTGVuZ3RoID0gMDsKICAgICBpZiAoIWF0dGFjaG1lbnRzLmlz RW1wdHkoKSkgewpAQCAtNTAwLDcgKzUwMCw3IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE91dGdv aW5nTWVzc2FnZShPd24KICAgICAgICAgICAgICAgICBhdHRhY2htZW50RkRCdWZmZXJMZW5ndGgr KzsKICAgICAgICAgfQogICAgIH0KLSAgICBPd25BcnJheVB0cjxjaGFyPiBhdHRhY2htZW50RkRC dWZmZXIgPSBhZG9wdEFycmF5UHRyKG5ldyBjaGFyW0NNU0dfU1BBQ0Uoc2l6ZW9mKGludCkgKiBh dHRhY2htZW50RkRCdWZmZXJMZW5ndGgpXSk7CisgICAgYXV0byBhdHRhY2htZW50RkRCdWZmZXIg PSBzdGQ6Om1ha2VfdW5pcXVlPGNoYXJbXT4oQ01TR19TUEFDRShzaXplb2YoaW50KSAqIGF0dGFj aG1lbnRGREJ1ZmZlckxlbmd0aCkpOwogCiAgICAgaWYgKCFhdHRhY2htZW50cy5pc0VtcHR5KCkp IHsKICAgICAgICAgaW50KiBmZFB0ciA9IDA7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAkocmV2aXNpb24gMTU2MDU2KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4 LDYgKzc4LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtQ29udGV4dENhaXJvLmg+CiAj aW5jbHVkZSA8V2ViS2l0Mi9XS0ltYWdlQ2Fpcm8uaD4KICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJh cy5oPgorI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KIAogI2lmIEVOQUJMRShWSUJSQVRJ T04pCiAjaW5jbHVkZSAiVmlicmF0aW9uQ2xpZW50RWZsLmgiCkBAIC03NTIsNyArNzUzLDcgQEAg c3RhdGljIFdLRXZlbnRNb2RpZmllcnMgdG9XS0V2ZW50TW9kaWZpZQogdm9pZCBFd2tWaWV3Ojpm ZWVkVG91Y2hFdmVudChFd2tfVG91Y2hfRXZlbnRfVHlwZSB0eXBlLCBjb25zdCBFaW5hX0xpc3Qq IHBvaW50cywgY29uc3QgRXZhc19Nb2RpZmllciogbW9kaWZpZXJzKQogewogICAgIHVuc2lnbmVk IGxlbmd0aCA9IGVpbmFfbGlzdF9jb3VudChwb2ludHMpOwotICAgIE93bkFycmF5UHRyPFdLVHlw ZVJlZj4gdG91Y2hQb2ludHMgPSBhZG9wdEFycmF5UHRyKG5ldyBXS1R5cGVSZWZbbGVuZ3RoXSk7 CisgICAgYXV0byB0b3VjaFBvaW50cyA9IHN0ZDo6bWFrZV91bmlxdWU8V0tUeXBlUmVmW10+KGxl bmd0aCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7CiAgICAg ICAgIEV3a19Ub3VjaF9Qb2ludCogcG9pbnQgPSBzdGF0aWNfY2FzdDxFd2tfVG91Y2hfUG9pbnQq PihlaW5hX2xpc3RfbnRoKHBvaW50cywgaSkpOwogICAgICAgICBBU1NFUlQocG9pbnQpOwpAQCAt MTMyMSw3ICsxMzIyLDcgQEAgdm9pZCBFd2tWaWV3OjpmZWVkVG91Y2hFdmVudHMoRXdrX1RvdWNo XwogICAgIGlmICghbGVuZ3RoKQogICAgICAgICByZXR1cm47CiAKLSAgICBPd25BcnJheVB0cjxX S1R5cGVSZWY+IHRvdWNoUG9pbnRzID0gYWRvcHRBcnJheVB0cihuZXcgV0tUeXBlUmVmW2xlbmd0 aF0pOworICAgIGF1dG8gdG91Y2hQb2ludHMgPSBzdGQ6Om1ha2VfdW5pcXVlPFdLVHlwZVJlZltd PihsZW5ndGgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewog ICAgICAgICBpbnQgeCwgeTsKICAgICAgICAgZXZhc190b3VjaF9wb2ludF9saXN0X250aF94eV9n ZXQoc2QtPmJhc2UuZXZhcywgaSwgJngsICZ5KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL1NuYXBzaG90SW1hZ2VHTC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL1NuYXBzaG90SW1hZ2VHTC5oCShyZXZpc2lvbiAxNTYwNTYp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9TbmFwc2hvdEltYWdlR0wuaAko d29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksNiBAQAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKIAogI2luY2x1ZGUgPFJlZlB0ckNhaXJvLmg+Ci0jaW5jbHVkZSA8d3RmL093bkFy cmF5UHRyLmg+CiAKIFBhc3NSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBnZXRJbWFnZVN1cmZhY2VG cm9tRnJhbWVCdWZmZXIoaW50IHgsIGludCB5LCBpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmlsZV9jaG9vc2VyX3Jl cXVlc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19maWxlX2Nob29zZXJfcmVxdWVzdC5jcHAJKHJldmlzaW9uIDE1NjA1NikKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19maWxlX2Nob29zZXJfcmVxdWVzdC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDcgQEAKICNpbmNsdWRlICJXS1N0cmluZy5oIgog I2luY2x1ZGUgIldLVVJMLmgiCiAjaW5jbHVkZSAiZXdrX2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0X3By aXZhdGUuaCIKLSNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KKyNpbmNsdWRlIDx3dGYvU3Rk TGliRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiB1c2luZyBuYW1l c3BhY2UgV2ViS2l0OwpAQCAtMTIwLDcgKzEyMCw3IEBAIEVpbmFfQm9vbCBld2tfZmlsZV9jaG9v c2VyX3JlcXVlc3RfZmlsZXMKICAgICBjb25zdCB1bnNpZ25lZCB1cmxDb3VudCA9IGVpbmFfbGlz dF9jb3VudChjaG9zZW5GaWxlcyk7CiAgICAgRUlOQV9TQUZFVFlfT05fRkFMU0VfUkVUVVJOX1ZB TCh1cmxDb3VudCA9PSAxIHx8ICh1cmxDb3VudCA+IDEgJiYgaW1wbC0+YWxsb3dNdWx0aXBsZUZp bGVzKCkpLCBmYWxzZSk7CiAKLSAgICBPd25BcnJheVB0cjxXS1R5cGVSZWY+IGZpbGVzVVJMcyA9 IGFkb3B0QXJyYXlQdHIobmV3IFdLVHlwZVJlZlt1cmxDb3VudF0pOworICAgIGF1dG8gZmlsZXNV UkxzID0gc3RkOjptYWtlX3VuaXF1ZTxXS1R5cGVSZWZbXT4odXJsQ291bnQpOwogCiAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IHVybENvdW50OyArK2kpIHsKICAgICAgICAgY29uc3QgY2hh ciogdXJsID0gc3RhdGljX2Nhc3Q8Y2hhcio+KGVpbmFfbGlzdF9udGgoY2hvc2VuRmlsZXMsIGkp KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9lZmwvUHJvY2Vzc0xh dW5jaGVyRWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1 bmNoZXIvZWZsL1Byb2Nlc3NMYXVuY2hlckVmbC5jcHAJKHJldmlzaW9uIDE1NjA1NikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9lZmwvUHJvY2Vzc0xhdW5jaGVyRWZsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvTmV0 d29ya2luZ0NvbnRleHQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9SdW5Mb29wLmg+Ci0jaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+ CisjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJp bmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtMzYsNyArMzYsNyBA QCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0YXRp YyBWZWN0b3I8T3duQXJyYXlQdHI8Y2hhcj4+IGNyZWF0ZUFyZ3NBcnJheShjb25zdCBTdHJpbmcm IHByZWZpeCwgY29uc3QgU3RyaW5nJiBleGVjdXRhYmxlUGF0aCwgY29uc3QgU3RyaW5nJiBzb2Nr ZXQsIGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCkKK3N0YXRpYyBWZWN0b3I8c3RkOjp1bmlxdWVf cHRyPGNoYXJbXT4+IGNyZWF0ZUFyZ3NBcnJheShjb25zdCBTdHJpbmcmIHByZWZpeCwgY29uc3Qg U3RyaW5nJiBleGVjdXRhYmxlUGF0aCwgY29uc3QgU3RyaW5nJiBzb2NrZXQsIGNvbnN0IFN0cmlu ZyYgcGx1Z2luUGF0aCkKIHsKICAgICBBU1NFUlQoIWV4ZWN1dGFibGVQYXRoLmlzRW1wdHkoKSk7 CiAgICAgQVNTRVJUKCFzb2NrZXQuaXNFbXB0eSgpKTsKQEAgLTQ5LDEzICs0OSwxMyBAQCBzdGF0 aWMgVmVjdG9yPE93bkFycmF5UHRyPGNoYXI+PiBjcmVhdGVBCiAgICAgaWYgKCFwbHVnaW5QYXRo LmlzRW1wdHkoKSkKICAgICAgICAgc3BsaXRBcmdzLmFwcGVuZChwbHVnaW5QYXRoKTsKIAotICAg IFZlY3RvcjxPd25BcnJheVB0cjxjaGFyPj4gYXJnczsKKyAgICBWZWN0b3I8c3RkOjp1bmlxdWVf cHRyPGNoYXJbXT4+IGFyZ3M7CiAgICAgYXJncy5yZXNpemUoc3BsaXRBcmdzLnNpemUoKSArIDEp OyAvLyBFeHRyYSByb29tIGZvciBudWxsLgogCiAgICAgc2l6ZV90IG51bUFyZ3MgPSBzcGxpdEFy Z3Muc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtQXJnczsgKytpKSB7CiAg ICAgICAgIENTdHJpbmcgcGFyYW0gPSBzcGxpdEFyZ3NbaV0udXRmOCgpOwotICAgICAgICBhcmdz W2ldID0gYWRvcHRBcnJheVB0cihuZXcgY2hhcltwYXJhbS5sZW5ndGgoKSArIDFdKTsgLy8gUm9v bSBmb3IgdGhlIHRlcm1pbmF0aW5nIG51bGwgY29taW5nIGZyb20gdGhlIENTdHJpbmcuCisgICAg ICAgIGFyZ3NbaV0gPSBzdGQ6Om1ha2VfdW5pcXVlPGNoYXJbXT4ocGFyYW0ubGVuZ3RoKCkgKyAx KTsgLy8gUm9vbSBmb3IgdGhlIHRlcm1pbmF0aW5nIG51bGwgY29taW5nIGZyb20gdGhlIENTdHJp bmcuCiAgICAgICAgIHN0cm5jcHkoYXJnc1tpXS5nZXQoKSwgcGFyYW0uZGF0YSgpLCBwYXJhbS5s ZW5ndGgoKSArIDEpOyAvLyArMSBoZXJlIHNvIHRoYXQgc3RybmNweSBjb3BpZXMgdGhlIGVuZGlu ZyBudWxsLgogICAgIH0KICAgICAvLyBleGVjdnAoKSBuZWVkcyB0aGUgcG9pbnRlcnMnIGFycmF5 IHRvIGJlIG51bGwtdGVybWluYXRlZC4KQEAgLTk3LDcgKzk3LDcgQEAgdm9pZCBQcm9jZXNzTGF1 bmNoZXI6OmxhdW5jaFByb2Nlc3MoKQogICAgIGlmICghbV9sYXVuY2hPcHRpb25zLnByb2Nlc3ND bWRQcmVmaXguaXNFbXB0eSgpKQogICAgICAgICBwcm9jZXNzQ21kUHJlZml4ID0gbV9sYXVuY2hP cHRpb25zLnByb2Nlc3NDbWRQcmVmaXg7CiAjZW5kaWYKLSAgICBWZWN0b3I8T3duQXJyYXlQdHI8 Y2hhcj4+IGFyZ3MgPSBjcmVhdGVBcmdzQXJyYXkocHJvY2Vzc0NtZFByZWZpeCwgZXhlY3V0YWJs ZVBhdGgsIFN0cmluZzo6bnVtYmVyKHNvY2tldHNbMF0pLCBwbHVnaW5QYXRoKTsKKyAgICBhdXRv IGFyZ3MgPSBjcmVhdGVBcmdzQXJyYXkocHJvY2Vzc0NtZFByZWZpeCwgZXhlY3V0YWJsZVBhdGgs IFN0cmluZzo6bnVtYmVyKHNvY2tldHNbMF0pLCBwbHVnaW5QYXRoKTsKIAogICAgIC8vIERvIG5v dCBwZXJmb3JtIG1lbW9yeSBhbGxvY2F0aW9uIGluIHRoZSBtaWRkbGUgb2YgdGhlIGZvcmsoKQog ICAgIC8vIGV4ZWMoKSBiZWxvdy4gRmFzdE1hbGxvYyBjYW4gcG90ZW50aWFsbHkgZGVhZGxvY2sg YmVjYXVzZQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJKHJldmlzaW9uIDE1NjA1NikKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OSw3ICs2OSw2IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9T ZWN1cml0eVBvbGljeS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4KICNpbmNsdWRl IDxXZWJDb3JlL1VzZXJHZXN0dXJlSW5kaWNhdG9yLmg+Ci0jaW5jbHVkZSA8d3RmL093bkFycmF5 UHRyLmg+CiAKICNpZiBFTkFCTEUoU0hBRE9XX0RPTSkgfHwgRU5BQkxFKENTU19SRUdJT05TKSB8 fCBFTkFCTEUoSUZSQU1FX1NFQU1MRVNTKSB8fCBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQogI2lu Y2x1ZGUgPFdlYkNvcmUvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oPgpJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2MvV0tCdW5kbGVQYWdlLmNwcAkocmV2aXNpb24gMTU2MDU2KQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01Miw3ICs1Miw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvS1VSTC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgotI2luY2x1 ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgorI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KIAog dXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIApAQCAtMTU5LDEwICsxNTksMTAgQEAgV0tBcnJheVJl ZiBXS0J1bmRsZVBhZ2VDb3B5Q29udGV4dE1lbnVJdAogewogI2lmIEVOQUJMRShDT05URVhUX01F TlVTKQogICAgIFdlYkNvbnRleHRNZW51KiBjb250ZXh0TWVudSA9IHRvSW1wbChwYWdlUmVmKS0+ Y29udGV4dE1lbnUoKTsKLSAgICBjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4g Jml0ZW1zID0gY29udGV4dE1lbnUtPml0ZW1zKCk7CisgICAgY29uc3QgVmVjdG9yPFdlYkNvbnRl eHRNZW51SXRlbURhdGE+JiBpdGVtcyA9IGNvbnRleHRNZW51LT5pdGVtcygpOwogICAgIHNpemVf dCBhcnJheUxlbmd0aCA9IGl0ZW1zLnNpemUoKTsKIAotICAgIE93bkFycmF5UHRyPFdLVHlwZVJl Zj4gd2tJdGVtcyA9IGFkb3B0QXJyYXlQdHIobmV3IFdLVHlwZVJlZlthcnJheUxlbmd0aF0pOwor ICAgIGF1dG8gd2tJdGVtcyA9IHN0ZDo6bWFrZV91bmlxdWU8V0tUeXBlUmVmW10+KGFycmF5TGVu Z3RoKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFycmF5TGVuZ3RoOyArK2kpCiAgICAg ICAgIHdrSXRlbXNbaV0gPSB0b0FQSShXZWJDb250ZXh0TWVudUl0ZW06OmNyZWF0ZShpdGVtc1tp XSkubGVha1JlZigpKTsKIApJbmRleDogU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gMTU2MDU2KQor KysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTkgQEAKKzIwMTMtMDktMTggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAg ICBSZXBsYWNlIHVzZSBvZiBPd25BcnJheVB0cjxGb28+IHdpdGggc3RkOjp1bmlxdWVfcHRyPEZv b1tdPiBpbiBXZWJLaXQgYW5kIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyMTU2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViSGlzdG9yeS5jcHA6CisgICAgICAgIChXZWJIaXN0b3J5 OjpyZW1vdmVBbGxJdGVtcyk6CisgICAgICAgIChXZWJIaXN0b3J5OjpvcmRlcmVkTGFzdFZpc2l0 ZWREYXlzKToKKyAgICAgICAgKFdlYkhpc3Rvcnk6OmFkZEl0ZW1Ub0RhdGVDYWNoZXMpOgorICAg ICAgICAoV2ViSGlzdG9yeTo6cmVtb3ZlSXRlbUZyb21EYXRlQ2FjaGVzKToKKyAgICAgICAgKiBX ZWJIaXN0b3J5Lmg6CisgICAgICAgICogV2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2Vi UHJlZmVyZW5jZXM6OmNvcHlXZWJLaXRQcmVmZXJlbmNlc1RvQ0ZQcmVmZXJlbmNlcyk6CisKIDIw MTMtMDktMTggIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgTWFrZSBXZWJIaXN0b3J5IG1vcmUgdHlwZSBzYWZlCkluZGV4OiBTb3VyY2UvV2ViS2l0L3dp bi9XZWJIaXN0b3J5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0 b3J5LmNwcAkocmV2aXNpb24gMTU2MDU2KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9y eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0MCw3ICsyNDAsNyBAQCBIUkVTVUxUIFNURE1FVEhP RENBTExUWVBFIFdlYkhpc3Rvcnk6OnJlCiBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYkhp c3Rvcnk6OnJlbW92ZUFsbEl0ZW1zKCB2b2lkKQogewogICAgIG1fZW50cmllc0J5RGF0ZS5jbGVh cigpOwotICAgIG1fb3JkZXJlZExhc3RWaXNpdGVkRGF5cy5jbGVhcigpOworICAgIG1fb3JkZXJl ZExhc3RWaXNpdGVkRGF5cyA9IG51bGxwdHI7CiAKICAgICBWZWN0b3I8SVdlYkhpc3RvcnlJdGVt Kj4gaXRlbXNWZWN0b3IobV9lbnRyaWVzQnlVUkwuc2l6ZSgpKTsKICAgICBmb3IgKGF1dG8gaXQg PSBtX2VudHJpZXNCeVVSTC5iZWdpbigpOyBpdCAhPSBtX2VudHJpZXNCeVVSTC5lbmQoKTsgKytp dCkKQEAgLTI3Miw3ICsyNzIsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYkhpc3Rv cnk6Om9yCiAKICAgICAqY291bnQgPSBkYXRlQ291bnQ7CiAgICAgaWYgKCFtX29yZGVyZWRMYXN0 VmlzaXRlZERheXMpIHsKLSAgICAgICAgbV9vcmRlcmVkTGFzdFZpc2l0ZWREYXlzID0gYWRvcHRB cnJheVB0cihuZXcgREFURVtkYXRlQ291bnRdKTsKKyAgICAgICAgbV9vcmRlcmVkTGFzdFZpc2l0 ZWREYXlzID0gc3RkOjptYWtlX3VuaXF1ZTxEQVRFW10+KGRhdGVDb3VudCk7CiAgICAgICAgIERh dGVUb0VudHJpZXNNYXA6OmNvbnN0X2l0ZXJhdG9yOjpLZXlzIGVuZCA9IG1fZW50cmllc0J5RGF0 ZS5lbmQoKS5rZXlzKCk7CiAgICAgICAgIGludCBpID0gMDsKICAgICAgICAgZm9yIChEYXRlVG9F bnRyaWVzTWFwOjpjb25zdF9pdGVyYXRvcjo6S2V5cyBpdCA9IG1fZW50cmllc0J5RGF0ZS5iZWdp bigpLmtleXMoKTsgaXQgIT0gZW5kOyArK2l0LCArK2kpCkBAIC01ODMsNyArNTgzLDcgQEAgSFJF U1VMVCBXZWJIaXN0b3J5OjphZGRJdGVtVG9EYXRlQ2FjaGVzKAogICAgICAgICBDRkFycmF5QXBw ZW5kVmFsdWUoZW50cnlBcnJheS5nZXQoKSwgZW50cnkpOwogICAgICAgICBtX2VudHJpZXNCeURh dGUuc2V0KGRhdGVLZXksIGVudHJ5QXJyYXkpOwogICAgICAgICAvLyBDbGVhciBtX29yZGVyZWRM YXN0VmlzaXRlZERheXMgc28gaXQgd2lsbCBiZSByZWdlbmVyYXRlZCB3aGVuIG5leHQgcmVxdWVz dGVkLgotICAgICAgICBtX29yZGVyZWRMYXN0VmlzaXRlZERheXMuY2xlYXIoKTsKKyAgICAgICAg bV9vcmRlcmVkTGFzdFZpc2l0ZWREYXlzID0gbnVsbHB0cjsKICAgICB9CiAKICAgICByZXR1cm4g aHI7CkBAIC02MTQsNyArNjE0LDcgQEAgSFJFU1VMVCBXZWJIaXN0b3J5OjpyZW1vdmVJdGVtRnJv bURhdGVDYQogICAgIGlmIChDRkFycmF5R2V0Q291bnQoZW50cmllc0ZvckRhdGUpID09IDApIHsK ICAgICAgICAgbV9lbnRyaWVzQnlEYXRlLnJlbW92ZShmb3VuZCk7CiAgICAgICAgIC8vIENsZWFy IG1fb3JkZXJlZExhc3RWaXNpdGVkRGF5cyBzbyBpdCB3aWxsIGJlIHJlZ2VuZXJhdGVkIHdoZW4g bmV4dCByZXF1ZXN0ZWQuCi0gICAgICAgIG1fb3JkZXJlZExhc3RWaXNpdGVkRGF5cy5jbGVhcigp OworICAgICAgICBtX29yZGVyZWRMYXN0VmlzaXRlZERheXMgPSBudWxscHRyOwogICAgIH0KIAog ICAgIHJldHVybiBocjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5LmgJKHJldmlzaW9uIDE1NjA1 NikKKysrIFNvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnkuaAkod29ya2luZyBjb3B5KQpAQCAt MjksOCArMjksOCBAQAogI2luY2x1ZGUgIldlYktpdC5oIgogI2luY2x1ZGUgPENvcmVGb3VuZGF0 aW9uL0NvcmVGb3VuZGF0aW9uLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9DT01QdHIuaD4KKyNpbmNs dWRlIDxtZW1vcnk+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KLSNpbmNsdWRlIDx3dGYvT3du QXJyYXlQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKQEAgLTE0Nyw3ICsxNDcsNyBAQCBwcml2YXRlOgogICAgIFVMT05HIG1fcmVmQ291bnQ7 CiAgICAgVVJMVG9FbnRyaWVzTWFwIG1fZW50cmllc0J5VVJMOwogICAgIERhdGVUb0VudHJpZXNN YXAgbV9lbnRyaWVzQnlEYXRlOwotICAgIE93bkFycmF5UHRyPERBVEU+IG1fb3JkZXJlZExhc3RW aXNpdGVkRGF5czsKKyAgICBzdGQ6OnVuaXF1ZTxEQVRFW10+IG1fb3JkZXJlZExhc3RWaXNpdGVk RGF5czsKICAgICBDT01QdHI8V2ViUHJlZmVyZW5jZXM+IG1fcHJlZmVyZW5jZXM7CiB9OwogCklu ZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiAxNTYwNTYpCisr KyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQxLDcgKzQxLDcgQEAKICNpbmNsdWRlIDxzaGxvYmouaD4KICNpbmNsdWRlIDx3Y2hhci5oPgog I2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+Ci0jaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+Cisj aW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CkBAIC00NzcsOCArNDc3LDggQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6Y29w eVdlYktpdFByZWZlcmVuYwogICAgIENGU3RyaW5nUmVmIGRpZFJlbW92ZURlZmF1bHRzS2V5ID0g Q0ZTVFIoV2ViS2l0RGlkTWlncmF0ZURlZmF1bHRTZXR0aW5nc0Zyb21TYWZhcmkzQmV0YVByZWZl cmVuY2VLZXkpOwogICAgIGJvb2wgb21pdERlZmF1bHRzID0gIWJvb2xlYW5WYWx1ZUZvclByZWZl cmVuY2VzVmFsdWUoQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZGljdCwgZGlkUmVtb3ZlRGVmYXVsdHNL ZXkpKTsKIAotICAgIE93bkFycmF5UHRyPENGVHlwZVJlZj4ga2V5cyA9IGFkb3B0QXJyYXlQdHIo bmV3IENGVHlwZVJlZltjb3VudF0pOwotICAgIE93bkFycmF5UHRyPENGVHlwZVJlZj4gdmFsdWVz ID0gYWRvcHRBcnJheVB0cihuZXcgQ0ZUeXBlUmVmW2NvdW50XSk7CisgICAgYXV0byBrZXlzID0g c3RkOjptYWtlX3VuaXF1ZTxDRlR5cGVSZWZbXT4oY291bnQpOworICAgIGF1dG8gdmFsdWVzID0g c3RkOjptYWtlX3VuaXF1ZTxDRlR5cGVSZWZbXT4oY291bnQpOwogICAgIENGRGljdGlvbmFyeUdl dEtleXNBbmRWYWx1ZXMoZGljdCwga2V5cy5nZXQoKSwgdmFsdWVzLmdldCgpKTsKIAogICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewo=