189082 2018-08-29 09:37:09 -0700 Rename wtf/text/mac/StringMac.mm to wtf/text/cocoa/StringCocoa.mm 2018-08-30 09:01:59 -0700 1 1 1 Unclassified WebKit Web Template Framework Safari 10 Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=186924 InRadar P2 Normal --- 188754 1 ddkilzer ddkilzer commit-queue darin sam webkit-bug-importer oldest_to_newest 1454795 0 ddkilzer 2018-08-29 09:37:09 -0700 Rename wtf/text/mac/StringMac.mm to wtf/text/cococa/StringCococa.mm. In the WTF Xcode project, StringMac.mm is already in the Source/wtf/text/cocoa folder. Moving it makes tidy-Xcode-project-file (Bug 188754) work without warnings, and renaming it makes it match naming conventions. 1454799 1 348404 ddkilzer 2018-08-29 09:46:27 -0700 Created attachment 348404 Patch v1 1454800 2 ddkilzer 2018-08-29 09:47:05 -0700 (In reply to David Kilzer (:ddkilzer) from comment #1) > Created attachment 348404 [details] > Patch v1 Here are the changes to String{Mac,Cocoa}.mm: diff --git a/Source/WTF/wtf/text/mac/StringMac.mm b/Source/WTF/wtf/text/cocoa/StringCocoa.mm similarity index 95% rename from Source/WTF/wtf/text/mac/StringMac.mm rename to Source/WTF/wtf/text/cocoa/StringCocoa.mm index 34e5c1a84fd..c6940aac125 100644 --- a/Source/WTF/wtf/text/mac/StringMac.mm +++ b/Source/WTF/wtf/text/cocoa/StringCocoa.mm @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. + * Copyright (C) 2006-2018 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,7 +31,7 @@ String::String(NSString *str) return; CFIndex size = CFStringGetLength(reinterpret_cast<CFStringRef>(str)); - if (size == 0) + if (!size) m_impl = StringImpl::empty(); else { Vector<LChar, 1024> lcharBuffer(size); 1454876 3 348404 commit-queue 2018-08-29 12:24:47 -0700 Comment on attachment 348404 Patch v1 Clearing flags on attachment: 348404 Committed r235473: <https://trac.webkit.org/changeset/235473> 1454877 4 commit-queue 2018-08-29 12:24:49 -0700 All reviewed patches have been landed. Closing bug. 1454878 5 webkit-bug-importer 2018-08-29 12:25:32 -0700 <rdar://problem/43852919> 348404 2018-08-29 09:46:27 -0700 2018-08-29 12:24:47 -0700 Patch v1 bug-189082-20180829094626.patch text/plain 10272 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDk2Y2FjNjBiNDE5OTE0ZmM4OWVjNTA3 Zjk4MTQ4YTM5ZTY0MDc3NDIuLjA4YTA0OTJmNGIxYjdlYThhNjRjMjgyNWY0OGU1NTQwMDU4ZjNl NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDgtMjkgIERhdmlkIEtpbHplciAgPGRka2ls emVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgd3RmL3RleHQvbWFjL1N0cmluZ01hYy5t bSB0byB3dGYvdGV4dC9jb2NvY2EvU3RyaW5nQ29jb2NhLm1tCisgICAgICAgIDxodHRwczovL3dl YmtpdC5vcmcvYi8xODkwODI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW5jbHVkZXMgYSBkcml2ZS1ieSBmaXggZm9yIGEgd2Via2l0LXN0eWxlIHdh cm5pbmc6CisKKyAgICAgICAgICAgIEVSUk9SOiBTb3VyY2UvV1RGL3d0Zi90ZXh0L2NvY29hL1N0 cmluZ0NvY29hLm1tOjM0OiAgVGVzdHMgZm9yIHRydWUvZmFsc2UsIG51bGwvbm9uLW51bGwsIGFu ZCB6ZXJvL25vbi16ZXJvIHNob3VsZCBhbGwgYmUgZG9uZSB3aXRob3V0IGVxdWFsaXR5IGNvbXBh cmlzb25zLiAgW3JlYWRhYmlsaXR5L2NvbXBhcmlzb25fdG9femVyb10gWzVdCisKKyAgICAgICAg KiBXVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajogVXBkYXRlIGZvciBtb3ZlIGFuZCByZW5h bWUuCisgICAgICAgICogd3RmL1BsYXRmb3JtTWFjLmNtYWtlOiBBZGQgbWlzc2luZyBjb2NvYS9T dHJpbmdDb2NvYS5tbSBzb3VyY2UKKyAgICAgICAgZmlsZS4gIERyaXZlLWJ5IGZpeCBmb3IgcmVu YW1lIG9mCisgICAgICAgIFRleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VNYWMubW0gdG8KKyAg ICAgICAgVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVUNvY29hLmNwcC4KKyAgICAgICAgKiB3 dGYvdGV4dC9jb2NvYS9TdHJpbmdDb2NvYS5tbTogUmVuYW1lZCBmcm9tIFNvdXJjZS9XVEYvd3Rm L3RleHQvbWFjL1N0cmluZ01hYy5tbS4KKyAgICAgICAgKFdURjo6U3RyaW5nOjpTdHJpbmcpOgor CiAyMDE4LTA4LTI3ICBZdXN1a2UgU3V6dWtpICA8eXVzdWtlc3V6dWtpQHNsb3dzdGFydC5vcmc+ CiAKICAgICAgICAgW1dlYkFzc2VtYmx5XSBQYXJzZSB3YXNtIG1vZHVsZXMgaW4gYSBzdHJlYW1p bmcgZmFzaGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9XVEYueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvaiBiL1NvdXJjZS9XVEYvV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXgg NDViNWNlYWVjZjBlMDJlYzVkNjUxNjc3ODc2NzVjNjg5ZDM1MjQ1ZC4uYTE5YTZjY2U3YzE3Y2Ew OTFlN2QxNzI3YjAyZGQ3MWU5OGY4Y2NmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9XVEYueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV1RGL1dURi54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCkBAIC04OCw3ICs4OCw3IEBACiAJCTlCQzcwRjA1MTc2QzM3OUQwMDEwMURF QyAvKiBBdG9taWNTdHJpbmdUYWJsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA5QkM3MEYwNDE3NkMzNzlEMDAxMDFERUMgLyogQXRvbWljU3RyaW5n VGFibGUuY3BwICovOyB9OwogCQlBM0I3MjVFQzk4NzQ0NkFEOTNGMUE0NDAgLyogUmFuZG9tRGV2 aWNlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEM4 RjU5N0NBMkE1NzQxN0ZCQUI5MkZENiAvKiBSYW5kb21EZXZpY2UuY3BwICovOyB9OwogCQlBM0U0 REQ5MzFGM0E4MDM0MDBERUQwQjQgLyogVGV4dFN0cmVhbS5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBM0U0REQ5MTFGM0E4MDM0MDBERUQwQjQgLyog VGV4dFN0cmVhbS5jcHAgKi87IH07Ci0JCUE1QkExNUYzMTgyNDMzQTkwMEE4MkU2OSAvKiBTdHJp bmdNYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBB NUJBMTVGMjE4MjQzM0E5MDBBODJFNjkgLyogU3RyaW5nTWFjLm1tICovOyB9OworCQlBNUJBMTVG MzE4MjQzM0E5MDBBODJFNjkgLyogU3RyaW5nQ29jb2EubW0gaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBNUJBMTVGMjE4MjQzM0E5MDBBODJFNjkgLyogU3Ry aW5nQ29jb2EubW0gKi87IH07CiAJCUE1QkExNUY1MTgyNDM0ODAwMEE4MkU2OSAvKiBTdHJpbmdJ bXBsQ29jb2EubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBBNUJBMTVGNDE4MjQzNDgwMDBBODJFNjkgLyogU3RyaW5nSW1wbENvY29hLm1tICovOyB9Owog CQlBNUJBMTVGQTE4MjQzNUE2MDBBODJFNjkgLyogQXRvbWljU3RyaW5nSW1wbENGLmNwcCBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE1QkExNUY3MTgyNDM1 QTYwMEE4MkU2OSAvKiBBdG9taWNTdHJpbmdJbXBsQ0YuY3BwICovOyB9OwogCQlBNUJBMTVGQjE4 MjQzNUE2MDBBODJFNjkgLyogU3RyaW5nQ0YuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gQTVCQTE1RjgxODI0MzVBNjAwQTgyRTY5IC8qIFN0cmluZ0NG LmNwcCAqLzsgfTsKQEAgLTQyNyw3ICs0MjcsNyBAQAogCQlBNTA5OEFGRjFDMTY5RTA3MDAwODc3 OTcgLyogU2FuZGJveFNQSS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTYW5k Ym94U1BJLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE1MDk4QjAxMUMxNkE0Rjkw MDA4Nzc5NyAvKiBTZWN1cml0eVNQSS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBTZWN1cml0eVNQSS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBNTYxRjMwRjFE RjI2NDIxMDBGRjY3NUQgLyogRGVwcmVjYXRlZE9wdGlvbmFsLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IERlcHJlY2F0ZWRPcHRpb25hbC5oOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwotCQlBNUJBMTVGMjE4MjQzM0E5MDBBODJFNjkgLyogU3RyaW5nTWFjLm1tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gU3RyaW5nTWFjLm1tOyBwYXRoID0g Li4vbWFjL1N0cmluZ01hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJQTVCQTE1 RjIxODI0MzNBOTAwQTgyRTY5IC8qIFN0cmluZ0NvY29hLm1tICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAub2JqY3BwOyBwYXRoID0gU3RyaW5nQ29jb2EubW07IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCUE1QkExNUY0MTgyNDM0ODAwMEE4MkU2OSAvKiBTdHJpbmdJbXBsQ29jb2EubW0g Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBTdHJpbmdJbXBsQ29jb2Eu bW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE1QkExNUY3MTgyNDM1QTYwMEE4MkU2 OSAvKiBBdG9taWNTdHJpbmdJbXBsQ0YuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3Bw OyBwYXRoID0gQXRvbWljU3RyaW5nSW1wbENGLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJQTVCQTE1RjgxODI0MzVBNjAwQTgyRTY5IC8qIFN0cmluZ0NGLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFN0cmluZ0NGLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTc3Niw4ICs3NzYsOCBAQAogCQlBNUJBMTVGMTE4MjQzMzlGMDBBODJF NjkgLyogY29jb2EgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAor CQkJCUE1QkExNUYyMTgyNDMzQTkwMEE4MkU2OSAvKiBTdHJpbmdDb2NvYS5tbSAqLywKIAkJCQlB NUJBMTVGNDE4MjQzNDgwMDBBODJFNjkgLyogU3RyaW5nSW1wbENvY29hLm1tICovLAotCQkJCUE1 QkExNUYyMTgyNDMzQTkwMEE4MkU2OSAvKiBTdHJpbmdNYWMubW0gKi8sCiAJCQkJOTM5MzRCRDIx OEExRThDMzAwRDBENkExIC8qIFN0cmluZ1ZpZXdDb2NvYS5tbSAqLywKIAkJCQkxQzE4MUM5NTFE MzA4MDBBMDBGNUZBMTYgLyogVGV4dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVUNvY29hLmNwcCAq LywKIAkJCSk7CkBAIC0xNTU1LDEwICsxNTU1LDEwIEBACiAJCQkJQThBNDc0M0MxNTFBODI1QjAw NDEyM0ZGIC8qIFN0cmluZ0J1aWxkZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJRTM4RDZFMjcx RjU1MjJFMzAwQTc1Q0M0IC8qIFN0cmluZ0J1aWxkZXJKU09OLmNwcCBpbiBTb3VyY2VzICovLAog CQkJCUE1QkExNUZCMTgyNDM1QTYwMEE4MkU2OSAvKiBTdHJpbmdDRi5jcHAgaW4gU291cmNlcyAq LywKKwkJCQlBNUJBMTVGMzE4MjQzM0E5MDBBODJFNjkgLyogU3RyaW5nQ29jb2EubW0gaW4gU291 cmNlcyAqLywKIAkJCQlBOEE0NzQ0MDE1MUE4MjVCMDA0MTIzRkYgLyogU3RyaW5nSW1wbC5jcHAg aW4gU291cmNlcyAqLywKIAkJCQlBNUJBMTVGQzE4MjQzNUE2MDBBODJFNjkgLyogU3RyaW5nSW1w bENGLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUE1QkExNUY1MTgyNDM0ODAwMEE4MkU2OSAvKiBT dHJpbmdJbXBsQ29jb2EubW0gaW4gU291cmNlcyAqLywKLQkJCQlBNUJBMTVGMzE4MjQzM0E5MDBB ODJFNjkgLyogU3RyaW5nTWFjLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMEZEREJGQTcxNjY2REZB MzAwQzU1RkVGIC8qIFN0cmluZ1ByaW50U3RyZWFtLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTkz RjE5OTNFMTlENzk1OEQwMEMyMzkwQiAvKiBTdHJpbmdWaWV3LmNwcCBpbiBTb3VyY2VzICovLAog CQkJCTkzOTM0QkQ1MThBMUYxNjkwMEQwRDZBMSAvKiBTdHJpbmdWaWV3Q0YuY3BwIGluIFNvdXJj ZXMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybU1hYy5jbWFrZSBiL1Nv dXJjZS9XVEYvd3RmL1BsYXRmb3JtTWFjLmNtYWtlCmluZGV4IDc4MzcyMzZmY2Q2ZDNhZGE3ZjFl MWZiMTM3YzczNzY1YTc1ZTc0Y2YuLmM2NTEzODg0ODA4NDc0YWE4ZTA5ZDA2NGY0ZWVjMWNiYjBl MjkyNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtTWFjLmNtYWtlCisrKyBi L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtTWFjLmNtYWtlCkBAIC01Nyw5ICs1NywxMCBAQCBsaXN0 KEFQUEVORCBXVEZfU09VUkNFUwogICAgIHRleHQvY2YvU3RyaW5nSW1wbENGLmNwcAogICAgIHRl eHQvY2YvU3RyaW5nVmlld0NGLmNwcAogCisgICAgdGV4dC9jb2NvYS9TdHJpbmdDb2NvYS5tbQog ICAgIHRleHQvY29jb2EvU3RyaW5nSW1wbENvY29hLm1tCiAgICAgdGV4dC9jb2NvYS9TdHJpbmdW aWV3Q29jb2EubW0KLSAgICB0ZXh0L2NvY29hL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VN YWMubW0KKyAgICB0ZXh0L2NvY29hL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VDb2NvYS5j cHAKICkKIAogbGlzdChBUFBFTkQgV1RGX1BSSVZBVEVfSU5DTFVERV9ESVJFQ1RPUklFUwpkaWZm IC0tZ2l0IGEvU291cmNlL1dURi93dGYvdGV4dC9jb2NvYS9TdHJpbmdDb2NvYS5tbSBiL1NvdXJj ZS9XVEYvd3RmL3RleHQvY29jb2EvU3RyaW5nQ29jb2EubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzY5NDBhYWMx MjViNDJlYmE5OTY5NjliYjcwN2YzNDFmOGFiYTc3MQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJj ZS9XVEYvd3RmL3RleHQvY29jb2EvU3RyaW5nQ29jb2EubW0KQEAgLTAsMCArMSw1MSBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAwNi0yMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3Ry aWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg TGlicmFyeSBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZy ZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vu c2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBs aWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWws CisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3 YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNv cHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25nIHdp dGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRl IHRvCisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBT dHJlZXQsIEZpZnRoIEZsb29yLAorICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisgKgor ICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJXVEZTdHJpbmcuaCIKKworI2lu Y2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NGU3RyaW5nLmg+CisKK25hbWVzcGFjZSBXVEYgeworCitT dHJpbmc6OlN0cmluZyhOU1N0cmluZyAqc3RyKQoreworICAgIGlmICghc3RyKQorICAgICAgICBy ZXR1cm47CisKKyAgICBDRkluZGV4IHNpemUgPSBDRlN0cmluZ0dldExlbmd0aChyZWludGVycHJl dF9jYXN0PENGU3RyaW5nUmVmPihzdHIpKTsKKyAgICBpZiAoIXNpemUpCisgICAgICAgIG1faW1w bCA9IFN0cmluZ0ltcGw6OmVtcHR5KCk7CisgICAgZWxzZSB7CisgICAgICAgIFZlY3RvcjxMQ2hh ciwgMTAyND4gbGNoYXJCdWZmZXIoc2l6ZSk7CisgICAgICAgIENGSW5kZXggdXNlZEJ1ZkxlbjsK KyAgICAgICAgQ0ZJbmRleCBjb252ZXJ0ZWRzaXplID0gQ0ZTdHJpbmdHZXRCeXRlcyhyZWludGVy cHJldF9jYXN0PENGU3RyaW5nUmVmPihzdHIpLCBDRlJhbmdlTWFrZSgwLCBzaXplKSwga0NGU3Ry aW5nRW5jb2RpbmdJU09MYXRpbjEsIDAsIGZhbHNlLCBsY2hhckJ1ZmZlci5kYXRhKCksIHNpemUs ICZ1c2VkQnVmTGVuKTsKKyAgICAgICAgaWYgKChjb252ZXJ0ZWRzaXplID09IHNpemUpICYmICh1 c2VkQnVmTGVuID09IHNpemUpKSB7CisgICAgICAgICAgICBtX2ltcGwgPSBTdHJpbmdJbXBsOjpj cmVhdGUobGNoYXJCdWZmZXIuZGF0YSgpLCBzaXplKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQorCisgICAgICAgIFZlY3RvcjxVQ2hhciwgMTAyND4gdWNoYXJCdWZmZXIoc2l6ZSk7 CisgICAgICAgIENGU3RyaW5nR2V0Q2hhcmFjdGVycyhyZWludGVycHJldF9jYXN0PENGU3RyaW5n UmVmPihzdHIpLCBDRlJhbmdlTWFrZSgwLCBzaXplKSwgdWNoYXJCdWZmZXIuZGF0YSgpKTsKKyAg ICAgICAgbV9pbXBsID0gU3RyaW5nSW1wbDo6Y3JlYXRlKHVjaGFyQnVmZmVyLmRhdGEoKSwgc2l6 ZSk7CisgICAgfQorfQorCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L21hYy9T dHJpbmdNYWMubW0gYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L21hYy9TdHJpbmdNYWMubW0KZGVsZXRl ZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDM0ZTVjMWE4NGZkZDMyNzc5NDQ4MzA5ZDQ4YzFkOTA4 NzU1ZmYxZWQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEv U291cmNlL1dURi93dGYvdGV4dC9tYWMvU3RyaW5nTWFjLm1tCisrKyAvZGV2L251bGwKQEAgLTEs NTEgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBJbmMuCi0gKgotICog VGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFu ZC9vcgotICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2Vu ZXJhbCBQdWJsaWMKLSAqIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJl IEZvdW5kYXRpb247IGVpdGhlcgotICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQg eW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgotICoKLSAqIFRoaXMgbGlicmFyeSBpcyBk aXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAotICogYnV0IFdJ VEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YK LSAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4g IFNlZSB0aGUgR05VCi0gKiBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUg ZGV0YWlscy4KLSAqCi0gKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCi0gKiBhbG9uZyB3aXRoIHRoaXMgbGli cmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bwotICogdGhl IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0 aCBGbG9vciwKLSAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgotICoKLSAqLwotCi0jaW5j bHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiV1RGU3RyaW5nLmgiCi0KLSNpbmNsdWRlIDxDb3Jl Rm91bmRhdGlvbi9DRlN0cmluZy5oPgotCi1uYW1lc3BhY2UgV1RGIHsKLQotU3RyaW5nOjpTdHJp bmcoTlNTdHJpbmcgKnN0cikKLXsKLSAgICBpZiAoIXN0cikKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgQ0ZJbmRleCBzaXplID0gQ0ZTdHJpbmdHZXRMZW5ndGgocmVpbnRlcnByZXRfY2FzdDxDRlN0 cmluZ1JlZj4oc3RyKSk7Ci0gICAgaWYgKHNpemUgPT0gMCkKLSAgICAgICAgbV9pbXBsID0gU3Ry aW5nSW1wbDo6ZW1wdHkoKTsKLSAgICBlbHNlIHsKLSAgICAgICAgVmVjdG9yPExDaGFyLCAxMDI0 PiBsY2hhckJ1ZmZlcihzaXplKTsKLSAgICAgICAgQ0ZJbmRleCB1c2VkQnVmTGVuOwotICAgICAg ICBDRkluZGV4IGNvbnZlcnRlZHNpemUgPSBDRlN0cmluZ0dldEJ5dGVzKHJlaW50ZXJwcmV0X2Nh c3Q8Q0ZTdHJpbmdSZWY+KHN0ciksIENGUmFuZ2VNYWtlKDAsIHNpemUpLCBrQ0ZTdHJpbmdFbmNv ZGluZ0lTT0xhdGluMSwgMCwgZmFsc2UsIGxjaGFyQnVmZmVyLmRhdGEoKSwgc2l6ZSwgJnVzZWRC dWZMZW4pOwotICAgICAgICBpZiAoKGNvbnZlcnRlZHNpemUgPT0gc2l6ZSkgJiYgKHVzZWRCdWZM ZW4gPT0gc2l6ZSkpIHsKLSAgICAgICAgICAgIG1faW1wbCA9IFN0cmluZ0ltcGw6OmNyZWF0ZShs Y2hhckJ1ZmZlci5kYXRhKCksIHNpemUpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9 Ci0KLSAgICAgICAgVmVjdG9yPFVDaGFyLCAxMDI0PiB1Y2hhckJ1ZmZlcihzaXplKTsKLSAgICAg ICAgQ0ZTdHJpbmdHZXRDaGFyYWN0ZXJzKHJlaW50ZXJwcmV0X2Nhc3Q8Q0ZTdHJpbmdSZWY+KHN0 ciksIENGUmFuZ2VNYWtlKDAsIHNpemUpLCB1Y2hhckJ1ZmZlci5kYXRhKCkpOwotICAgICAgICBt X2ltcGwgPSBTdHJpbmdJbXBsOjpjcmVhdGUodWNoYXJCdWZmZXIuZGF0YSgpLCBzaXplKTsKLSAg ICB9Ci19Ci0KLX0K