From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 5A8D23849ACF for ; Fri, 19 Apr 2024 20:08:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5A8D23849ACF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5A8D23849ACF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713557314; cv=none; b=KmEmCH1oNnPQE4pOTtXTfvSxbmoOVCsNBhboXEjIjzAOgi2cNn3QTrvGBtTxAb/NVJz6JlsTtyN0m0+byjC8jQUbp1eFugAvsHmd4aHyEc64lexN3QSzfv3+hOBHdTWSSM6k9NpPbDKnH6Kv4eiw8yn7crYFVuIZP0051QgLy00= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713557314; c=relaxed/simple; bh=z0q5m4hED8O6XsOURJ/+veo4CJDpNYve5hXgGrRTchY=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=AzSVdAOwIai8LwmPsubOqWlMD8w4zlvTZ1Tac0qqn/fEqM2bYuJFY6J8zmlHOLIkMeKOouWVIjhPCsm0gRSsJyRK/uAbw1+NSydcWSuAITmLb0HpIam0BZpy7XSz4JoJpwqTSyV7kXKfhSdxnE0wMen697+Zaga6FtDh/wDwFBM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713557311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=z0q5m4hED8O6XsOURJ/+veo4CJDpNYve5hXgGrRTchY=; b=aluBRtNdDSDkPE/82ErnhVVoavznv6aPeNilyjsx5+WSSD+TCdYNKUSMtQ4YskgPdelXqm HB9xaBVjkZNXkmuJxNWQNTlbJf1WLr1QsjEFtly2M5J36FnsDgyf6Eps+jEouwsV+aIY/9 fURkU7fNzq3ibH5z0fAw4NRgKZ1Q3Zc= Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-295-HOKUk_IXNAKe7XKco1NShA-1; Fri, 19 Apr 2024 16:08:27 -0400 X-MC-Unique: HOKUk_IXNAKe7XKco1NShA-1 Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-dc743cc50a6so3622668276.2 for ; Fri, 19 Apr 2024 13:08:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713557306; x=1714162106; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=z0q5m4hED8O6XsOURJ/+veo4CJDpNYve5hXgGrRTchY=; b=t/fT8l9HvvZyjHj7PtxEulsOsEWpZOsfX2Z922FmGfupzgDcB5xA3cKVA4pq4hkY9S fnYfkZyhePSdt0d3ve/Z/BKSQkXxE8x3QXcnhurLIul/gkl+aMI7T0j6BQk1egyx8fra Arur+ij8ee1kZkbBRFvB07R86dX2NeqedGCp2gOy6X/SRQO60xMX5xBFPiCu6ZtyB0cC dP8HyL0wtPoiS6+CLjaM+GhVZNT2+ztEIE/mWDNwrlBZOsqeaoPE6stlC4GoypWcH4fP q3URlFVPuM+5xidOs+fJV+0ImEiiL4fXmnb3VxZwWsQFZqbQ1aIvzc+dTrMPh+ySLit9 roEw== X-Gm-Message-State: AOJu0Yw/1CiklL9TGEF+PaZ7H7lMx0OBg9TbeCUja0hWs9AsJr1Id/ay hgxJZmfWC9rCOyaE2BKvgEl9tPjAM7MVDdST/HbIc+nxw1FAgONkDwb0bvYajEFb2soAQN4fzrJ aKPOzivSyLOxPaqZC5iECS84KmSFO0IcXqrI/EZGUnZbvor+fjqEexDQ+RPuXm3+9ugn/w+dR49 XsEGFI9aMvGvzXVrBPpyOKXxeFv70= X-Received: by 2002:a25:e086:0:b0:dd9:2a67:f470 with SMTP id x128-20020a25e086000000b00dd92a67f470mr3033363ybg.25.1713557306730; Fri, 19 Apr 2024 13:08:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3zsVN0hhnD0vAjmmlW6EnMfvrDo/G+PcKveadDQ4eAuCVt4GD+QWu94KKPs0NSNJZj9TCAvC5YUzniNZigLQ= X-Received: by 2002:a25:e086:0:b0:dd9:2a67:f470 with SMTP id x128-20020a25e086000000b00dd92a67f470mr3033351ybg.25.1713557306443; Fri, 19 Apr 2024 13:08:26 -0700 (PDT) MIME-Version: 1.0 References: <20240418163319.1279591-1-jwakely@redhat.com> In-Reply-To: From: Jonathan Wakely Date: Fri, 19 Apr 2024 21:08:09 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: Support link chains in std::chrono::tzdb::locate_zone [PR114770] To: Richard Biener Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="0000000000008db3f4061678a660" X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --0000000000008db3f4061678a660 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 19 Apr 2024 at 10:08, Jonathan Wakely wrote: > > On Fri, 19 Apr 2024 at 07:14, Richard Biener = wrote: > > > > On Thu, Apr 18, 2024 at 6:34=E2=80=AFPM Jonathan Wakely wrote: > > > > > > This would fix the but, how do people feel about it this close to the > > > gcc-14 release? > > > > Guess we'll have to fix it anyway, so why not now ... > > Yeah, I don't think Debian is going to stop using this feature, and it > might get used more widely in future (it's currently part of the > "vanguard" format for tzdata, but might move to "main" one day and > then all distros would have chained links). So it needs to be > backported to gcc-13 too. > > > (what could go wrong..) > > Well the risk is that my new code doesn't correctly detect cycles, and > so could go into an infinite loop when trying to follow chained links. > The current code on trunk will just fail to find a time_zone and throw > an exception, which is not ideal, but predictable and easily > understood. Attempting to handle chained links adds complexity. > > I think my new code is correct so that it won't get stuck in a loop, > and there are tests which should cover it sufficiently. And for > correctly tzdata.zi there will never be cycles anyway, so even if I > messed the code up, it shouldn't matter unless the application > provides a custom tzdata.zi with invalid links. > > So I guess I'll push it, and backport to gcc-13 soon. I've pushed the attached, which is the same as the earlier patch except for adding a new function to the testsuite/std/time/tzdb/1.cc test. --0000000000008db3f4061678a660 Content-Type: text/plain; charset="US-ASCII"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lv73rgii0 Y29tbWl0IGVlZDdmYjFiMmZlNzIxNTBjZDZhZjEwZGQzYjhmN2ZjNGYwYTRkYTEKQXV0aG9yOiBK b25hdGhhbiBXYWtlbHkgPGp3YWtlbHlAcmVkaGF0LmNvbT4KRGF0ZTogICBUaHUgQXByIDE4IDEy OjE0OjQxIDIwMjQKCiAgICBsaWJzdGRjKys6IFN1cHBvcnQgbGluayBjaGFpbnMgaW4gc3RkOjpj aHJvbm86OnR6ZGI6OmxvY2F0ZV96b25lIFtQUjExNDc3MF0KICAgIAogICAgU2luY2UgMjAyMiB0 aGUgVFppZiBmb3JtYXQgZGVmaW5lZCBpbiB0aGUgemljKDgpIG1hbiBwYWdlIGhhcyBzYWlkIHRo YXQKICAgIGxpbmtzIGNhbiByZWZlciB0byBvdGhlciBsaW5rcywgcmF0aGVyIHRoYW4gb25seSBy ZWZlcnJpbmcgdG8gYSB6b25lLgogICAgVGhpcyBpc24ndCBzdXBwb3J0ZWQgYnkgdGhlIEMrKzIw IHNwZWMsIHdoaWNoIGFzc3VtZXMgdGhhdCB0aGUgdGFyZ2V0KCkKICAgIGZvciBhIGNocm9ubzo6 dGltZV96b25lX2xpbmsgYWx3YXlzIG5hbWVzIGEgY2hyb25vOjp0aW1lX3pvbmUsIG5vdAogICAg YW5vdGhlciBjaHJvbm86OnRpbWVfem9uZV9saW5rLgogICAgCiAgICBUaGlzIGhhc24ndCBiZWVu IGEgcHJvYmxlbSB1bnRpbCBub3csIGJlY2F1c2UgdGhlcmUgYXJlIG5vIGVudHJpZXMgaW4KICAg IHRoZSB0emRhdGEgZmlsZSB0aGF0IGNoYWluIGxpbmtzIHRvZ2V0aGVyLiBIb3dldmVyLCBEZWJp YW4gU2lkIGhhcwogICAgY2hhbmdlZCB0aGUgdGFyZ2V0IG9mIHRoZSBBc2lhL0NodW5na2luZyBs aW5rIGZyb20gdGhlIEFzaWEvU2hhbmdoYWkKICAgIHpvbmUgdG8gdGhlIEFzaWEvQ2hvbmdxaW5n IGxpbmssIGNyZWF0aW5nIGEgbGluayBjaGFpbi4gVGhlIGxpYnN0ZGMrKwogICAgY29kZSBpcyB1 bmFibGUgdG8gaGFuZGxlIHRoaXMsIHNvIGNocm9ubzo6bG9jYXRlX3pvbmUoIkFzaWEvQ2h1bmdr aW5nIikKICAgIHdpbGwgZmFpbCB3aXRoIHRoZSB0emRhdGEuemkgZmlsZSBmcm9tIERlYmlhbiBT aWQuCiAgICAKICAgIEl0IHNlZW1zIGxpa2VseSB0aGF0IHRoZSBDKysgc3BlYyB3aWxsIG5lZWQg YSBjaGFuZ2UgdG8gYWxsb3cgbGluawogICAgY2hhaW5zLCBzbyB0aGF0IHRoZSBvcmlnaW5hbCBz dHJ1Y3R1cmUgb2YgdGhlIElBTkEgZGF0YWJhc2UgY2FuIGJlIGZ1bGx5CiAgICByZXByZXNlbnRl ZCBieSBjaHJvbm86OnR6ZGIuIFRoZSBhbHRlcm5hdGl2ZSB3b3VsZCBiZSBmb3IgY2hyb25vOjp0 emRiCiAgICB0byBmbGF0dGVuIGFsbCBjaGFpbnMgd2hlbiBsb2FkaW5nIHRoZSBkYXRhLCBzbyB0 aGF0IGEgbGluaydzIHRhcmdldCBpcwogICAgYWx3YXlzIGEgem9uZSwgYnV0IHRoaXMgbWVhbnMg dGhyb3dpbmcgYXdheSBpbmZvcm1hdGlvbiBwcmVzZW50IGluIHRoZQogICAgdHpkYXRhLnppIGlu cHV0IGZpbGUuCiAgICAKICAgIEluIGFudGljaXBhdGlvbiBvZiBhIGNoYW5nZSB0byB0aGUgc3Bl YywgdGhpcyBjb21taXQgYWRkcyBzdXBwb3J0IGZvcgogICAgY2hhaW5lZCBsaW5rcyB0byBsaWJz dGRjKysuIFdoZW4gYSBuYW1lIGlzIGZvdW5kIHRvIGJlIGEgbGluaywgd2UgdHJ5IHRvCiAgICBm aW5kIGl0cyB0YXJnZXQgaW4gdGhlIGxpc3Qgb2Ygem9uZXMgYXMgYmVmb3JlLCBidXQgbm93IGlm IHRoZSB0YXJnZXQKICAgIGlzbid0IHRoZSBuYW1lIG9mIGEgem9uZSB3ZSBkb24ndCBmYWlsLiBJ bnN0ZWFkIHdlIGxvb2sgZm9yIGFub3RoZXIgbGluawogICAgd2l0aCB0aGF0IG5hbWUsIGFuZCBr ZWVwIGRvaW5nIHRoYXQgdW50aWwgd2UgcmVhY2ggdGhlIGVuZCBvZiB0aGUgY2hhaW4KICAgIG9m IGxpbmtzLCBhbmQgdGhlbiBsb29rIHVwIHRoZSBsYXN0IHRhcmdldCBhcyBhIHpvbmUuCiAgICAK ICAgIFRoaXMgbmV3IGxvZ2ljIHdvdWxkIGdldCBzdHVjayBpbiBhIGxvb3AgaWYgdGhlIHR6ZGF0 YS56aSBmaWxlIGlzIGJ1Z2d5CiAgICBhbmQgZGVmaW5lcyBhIGxpbmsgY2hhaW4gdGhhdCBjb250 YWlucyBhIGN5Y2xlLCBlLmcuIHR3byBsaW5rcyB0aGF0CiAgICByZWZlciB0byBlYWNoIG90aGVy LiBUbyBkZWFsIHdpdGggdGhhdCB1bmxpa2VseSBjYXNlLCB3ZSB1c2UgdGhlCiAgICB0b3J0b2lz ZSBhbmQgaGFyZSBhbGdvcml0aG0gdG8gZGV0ZWN0IGN5Y2xlcyBpbiBsaW5rIGNoYWlucywgYW5k IHRocm93CiAgICBhbiBleGNlcHRpb24gaWYgd2UgZGV0ZWN0IGEgY3ljbGUuIEN5Y2xlcyBpbiBs aW5rcyBzaG91bGQgbmV2ZXIgaGFwcGVuLAogICAgYW5kIGl0IGlzIGV4cGVjdGVkIHRoYXQgbGlu ayBjaGFpbnMgd2lsbCBiZSBzaG9ydCAoaWYgdGhleSBvY2N1ciBhdCBhbGwpCiAgICBhbmQgc28g dGhlIGNvZGUgaXMgb3B0aW1pemVkIGZvciBzaG9ydCBjaGFpbnMgd2l0aG91dCBjeWNsZXMuIExv bmdlcgogICAgY2hhaW5zIChmb3VyIG9yIG1vcmUgbGlua3MpIGFuZCBjeWNsZXMgd2lsbCBkbyBt b3JlIHdvcmssIGJ1dCB3b24ndCBmYWlsCiAgICB0byByZXNvbHZlIGEgY2hhaW4gb3IgZ2V0IHN0 dWNrIGluIGEgbG9vcC4KICAgIAogICAgVGhlIG5ldyB0ZXN0IGZpbGUgY2hlY2tzIHZhcmlvdXMg Zm9ybXMgb2YgYnJva2VuIGxpbmtzIGFuZCBjeWNsZXMuCiAgICAKICAgIEFsc28gYWRkIGEgbmV3 IGNoZWNrIGluIHRoZSB0ZXN0c3VpdGUgdGhhdCBldmVyeSBlbGVtZW50IGluIHRoZQogICAgZ2V0 X3R6ZGIoKS56b25lcyBhbmQgZ2V0X3R6ZGIoKS5saW5rcyBzZXF1ZW5jZXMgY2FuIGJlIHN1Y2Nl c3NmdWxseQogICAgZm91bmQgdXNpbmcgbG9jYXRlX3pvbmUuCiAgICAKICAgIGxpYnN0ZGMrKy12 My9DaGFuZ2VMb2c6CiAgICAKICAgICAgICAgICAgUFIgbGlic3RkYysrLzExNDc3MAogICAgICAg ICAgICAqIHNyYy9jKysyMC90emRiLmNjIChkb19sb2NhdGVfem9uZSk6IFN1cHBvcnQgbGlua3Mg dGhhdCBoYXZlCiAgICAgICAgICAgIGFub3RoZXIgbGluayBhcyB0aGVpciB0YXJnZXQuCiAgICAg ICAgICAgICogdGVzdHN1aXRlL3N0ZC90aW1lL3R6ZGIvMS5jYzogQ2hlY2sgdGhhdCBhbGwgem9u ZXMgYW5kIGxpbmtzCiAgICAgICAgICAgIGNhbiBiZSBmb3VuZCBieSBsb2NhdGVfem9uZS4KICAg ICAgICAgICAgKiB0ZXN0c3VpdGUvc3RkL3RpbWUvdHpkYi9saW5rcy5jYzogTmV3IHRlc3QuCgpk aWZmIC0tZ2l0IGEvbGlic3RkYysrLXYzL3NyYy9jKysyMC90emRiLmNjIGIvbGlic3RkYysrLXYz L3NyYy9jKysyMC90emRiLmNjCmluZGV4IDYzOWQxYzQ0MGJhLi5jN2M3Y2M5ZGVlZSAxMDA2NDQK LS0tIGEvbGlic3RkYysrLXYzL3NyYy9jKysyMC90emRiLmNjCisrKyBiL2xpYnN0ZGMrKy12My9z cmMvYysrMjAvdHpkYi5jYwpAQCAtMTU5OSw3ICsxNTk5LDcgQEAgbmFtZXNwYWNlIHN0ZDo6Y2hy b25vCiAgICAgY29uc3QgdGltZV96b25lKgogICAgIGRvX2xvY2F0ZV96b25lKGNvbnN0IHZlY3Rv cjx0aW1lX3pvbmU+JiB6b25lcywKIAkJICAgY29uc3QgdmVjdG9yPHRpbWVfem9uZV9saW5rPiYg bGlua3MsCi0JCSAgIHN0cmluZ192aWV3IHR6X25hbWUpIG5vZXhjZXB0CisJCSAgIHN0cmluZ192 aWV3IHR6X25hbWUpCiAgICAgewogICAgICAgLy8gTGFtYmRhIG1hbmdsaW5nIGNoYW5nZWQgYmV0 d2VlbiAtZmFiaS12ZXJzaW9uPTIgYW5kIC1mYWJpLXZlcnNpb249MTgKICAgICAgIGF1dG8gc2Vh cmNoID0gW108Y2xhc3MgVmVjPihjb25zdCBWZWMmIHYsIHN0cmluZ192aWV3IG5hbWUpIHsKQEAg LTE2MTAsMTMgKzE2MTAsNjIgQEAgbmFtZXNwYWNlIHN0ZDo6Y2hyb25vCiAJcmV0dXJuIHB0cjsK ICAgICAgIH07CiAKKyAgICAgIC8vIFNlYXJjaCB6b25lcyBmaXJzdC4KICAgICAgIGlmIChhdXRv IHR6ID0gc2VhcmNoKHpvbmVzLCB0el9uYW1lKSkKIAlyZXR1cm4gdHo7CiAKKyAgICAgIC8vIFNl YXJjaCBsaW5rcyBzZWNvbmQuCiAgICAgICBpZiAoYXV0byB0el9sID0gc2VhcmNoKGxpbmtzLCB0 el9uYW1lKSkKLQlyZXR1cm4gc2VhcmNoKHpvbmVzLCB0el9sLT50YXJnZXQoKSk7CisJeworCSAg Ly8gSGFuZGxlIHRoZSBjb21tb24gY2FzZSBvZiBhIGxpbmsgdGhhdCBoYXMgYSB6b25lIGFzIHRo ZSB0YXJnZXQuCisJICBpZiAoYXV0byB0eiA9IHNlYXJjaCh6b25lcywgdHpfbC0+dGFyZ2V0KCkp KSBbW2xpa2VseV1dCisJICAgIHJldHVybiB0ejsKIAotICAgICAgcmV0dXJuIG51bGxwdHI7CisJ ICAvLyBFaXRoZXIgdHpfbC0+dGFyZ2V0KCkgZG9lc24ndCBleGlzdCwgb3Igd2UgaGF2ZSBhIGNo YWluIG9mIGxpbmtzLgorCSAgLy8gVXNlIEZsb3lkJ3MgY3ljbGUtZmluZGluZyBhbGdvcml0aG0g dG8gYXZvaWQgaW5maW5pdGUgbG9vcHMsCisJICAvLyBhdCB0aGUgY29zdCBvZiBleHRyYSBsb29r dXBzLiBJbiB0aGUgY29tbW9uIGNhc2Ugd2UgZXhwZWN0IGEKKwkgIC8vIGNoYWluIG9mIGxpbmtz IHRvIGJlIHNob3J0IHNvIHRoZSBsb29wIHdvbid0IHJ1biBtYW55IHRpbWVzLgorCSAgLy8gSW4g cGFydGljdWxhciwgdGhlIGR1cGxpY2F0ZSBsb29rdXBzIHRvIG1vdmUgdGhlIHRvcnRvaXNlCisJ ICAvLyBuZXZlciBoYXBwZW4gdW5sZXNzIHRoZSBjaGFpbiBoYXMgZm91ciBvciBtb3JlIGxpbmtz LgorCSAgLy8gV2hlbiBhIGNoYWluIGNvbnRhaW5zIGEgY3ljbGUgd2UgZG8gbXVsdGlwbGUgZHVw bGljYXRlIGxvb2t1cHMsCisJICAvLyBidXQgdGhhdCBjYXNlIHNob3VsZCBuZXZlciBoYXBwZW4g d2l0aCBjb3JyZWN0IHR6ZGF0YS56aSwKKwkgIC8vIHNvIHRoZXJlJ3Mgbm8gbmVlZCB0byBvcHRp bWl6ZSBjeWNsZSBkZXRlY3Rpb24uCisKKwkgIGNvbnN0IHRpbWVfem9uZV9saW5rKiB0b3J0b2lz ZSA9IHR6X2w7CisJICBjb25zdCB0aW1lX3pvbmVfbGluayogaGFyZSA9IHNlYXJjaChsaW5rcywg dHpfbC0+dGFyZ2V0KCkpOworCSAgd2hpbGUgKGhhcmUpCisJICAgIHsKKwkgICAgICAvLyBDaGFp bnMgc2hvdWxkIGJlIHNob3J0LCBzbyBmaXJzdCBjaGVjayBpZiBpdCBlbmRzIGhlcmU6CisJICAg ICAgaWYgKGF1dG8gdHogPSBzZWFyY2goem9uZXMsIGhhcmUtPnRhcmdldCgpKSkgW1tsaWtlbHld XQorCQlyZXR1cm4gdHo7CisKKwkgICAgICAvLyBPdGhlcndpc2UgZm9sbG93IHRoZSBjaGFpbjoK KwkgICAgICBoYXJlID0gc2VhcmNoKGxpbmtzLCBoYXJlLT50YXJnZXQoKSk7CisJICAgICAgaWYg KCFoYXJlKQorCQlicmVhazsKKworCSAgICAgIC8vIEFnYWluLCBmaXJzdCBjaGVjayBpZiB0aGUg Y2hhaW4gZW5kcyBhdCBhIHpvbmUgaGVyZToKKwkgICAgICBpZiAoYXV0byB0eiA9IHNlYXJjaCh6 b25lcywgaGFyZS0+dGFyZ2V0KCkpKSBbW2xpa2VseV1dCisJCXJldHVybiB0ejsKKworCSAgICAg IC8vIEZvbGxvdyB0aGUgY2hhaW4gYWdhaW46CisJICAgICAgaGFyZSA9IHNlYXJjaChsaW5rcywg aGFyZS0+dGFyZ2V0KCkpOworCisJICAgICAgaWYgKGhhcmUgPT0gdG9ydG9pc2UpCisJCXsKKwkJ ICBzdHJpbmdfdmlldyBlcnIgPSAic3RkOjpjaHJvbm86OnR6ZGI6IGxpbmsgY3ljbGU6ICI7CisJ CSAgc3RyaW5nIHN0cjsKKwkJICBzdHIucmVzZXJ2ZShlcnIuc2l6ZSgpICsgdHpfbmFtZS5zaXpl KCkpOworCQkgIHN0ciArPSBlcnI7CisJCSAgc3RyICs9IHR6X25hbWU7CisJCSAgX190aHJvd19y dW50aW1lX2Vycm9yKHN0ci5jX3N0cigpKTsKKwkJfQorCSAgICAgIC8vIFBsb2QgYWxvbmcgdGhl IGNoYWluIG9uZSBzdGVwOgorCSAgICAgIHRvcnRvaXNlID0gc2VhcmNoKGxpbmtzLCB0b3J0b2lz ZS0+dGFyZ2V0KCkpOworCSAgICB9CisJfQorCisgICAgICByZXR1cm4gbnVsbHB0cjsgLy8gbm90 IGZvdW5kCiAgICAgfQogICB9IC8vIG5hbWVzcGFjZQogCkBAIC0xNjI2LDcgKzE2NzUsNyBAQCBu YW1lc3BhY2Ugc3RkOjpjaHJvbm8KICAgewogICAgIGlmIChhdXRvIHR6ID0gZG9fbG9jYXRlX3pv bmUoem9uZXMsIGxpbmtzLCB0el9uYW1lKSkKICAgICAgIHJldHVybiB0ejsKLSAgICBzdHJpbmdf dmlldyBlcnIgPSAidHpkYjogY2Fubm90IGxvY2F0ZSB6b25lOiAiOworICAgIHN0cmluZ192aWV3 IGVyciA9ICJzdGQ6OmNocm9ubzo6dHpkYjogY2Fubm90IGxvY2F0ZSB6b25lOiAiOwogICAgIHN0 cmluZyBzdHI7CiAgICAgc3RyLnJlc2VydmUoZXJyLnNpemUoKSArIHR6X25hbWUuc2l6ZSgpKTsK ICAgICBzdHIgKz0gZXJyOwpkaWZmIC0tZ2l0IGEvbGlic3RkYysrLXYzL3Rlc3RzdWl0ZS9zdGQv dGltZS90emRiLzEuY2MgYi9saWJzdGRjKystdjMvdGVzdHN1aXRlL3N0ZC90aW1lL3R6ZGIvMS5j YwppbmRleCBjZjlkZjk1MjU3Ny4uNzk2ZjNhOGI0MjUgMTAwNjQ0Ci0tLSBhL2xpYnN0ZGMrKy12 My90ZXN0c3VpdGUvc3RkL3RpbWUvdHpkYi8xLmNjCisrKyBiL2xpYnN0ZGMrKy12My90ZXN0c3Vp dGUvc3RkL3RpbWUvdHpkYi8xLmNjCkBAIC00Nyw2ICs0NywxOCBAQCB0ZXN0X2xvY2F0ZSgpCiAg IFZFUklGWSggZGIubG9jYXRlX3pvbmUoZGIuY3VycmVudF96b25lKCktPm5hbWUoKSkgPT0gZGIu Y3VycmVudF96b25lKCkgKTsKIH0KIAordm9pZAordGVzdF9hbGxfem9uZXMoKQoreworICBjb25z dCB0emRiJiBkYiA9IGdldF90emRiKCk7CisKKyAgZm9yIChjb25zdCBhdXRvJiB6b25lIDogZGIu em9uZXMpCisgICAgVkVSSUZZKCBsb2NhdGVfem9uZSh6b25lLm5hbWUoKSktPm5hbWUoKSA9PSB6 b25lLm5hbWUoKSApOworCisgIGZvciAoY29uc3QgYXV0byYgbGluayA6IGRiLmxpbmtzKQorICAg IFZFUklGWSggbG9jYXRlX3pvbmUobGluay5uYW1lKCkpID09IGxvY2F0ZV96b25lKGxpbmsudGFy Z2V0KCkpICk7Cit9CisKIGludCBtYWluKCkKIHsKICAgdGVzdF92ZXJzaW9uKCk7CmRpZmYgLS1n aXQgYS9saWJzdGRjKystdjMvdGVzdHN1aXRlL3N0ZC90aW1lL3R6ZGIvbGlua3MuY2MgYi9saWJz dGRjKystdjMvdGVzdHN1aXRlL3N0ZC90aW1lL3R6ZGIvbGlua3MuY2MKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjBiYTIxNDg0NmM2Ci0tLSAvZGV2L251bGwKKysrIGIv bGlic3RkYysrLXYzL3Rlc3RzdWl0ZS9zdGQvdGltZS90emRiL2xpbmtzLmNjCkBAIC0wLDAgKzEs MjE1IEBACisvLyB7IGRnLWRvIHJ1biB7IHRhcmdldCBjKysyMCB9IH0KKy8vIHsgZGctcmVxdWly ZS1lZmZlY3RpdmUtdGFyZ2V0IHR6ZGIgfQorLy8geyBkZy1yZXF1aXJlLWVmZmVjdGl2ZS10YXJn ZXQgY3h4MTFfYWJpIH0KKy8vIHsgZGcteGZhaWwtcnVuLWlmICJubyB3ZWFrIG92ZXJyaWRlIG9u IEFJWCIgeyBwb3dlcnBjLWlibS1haXgqIH0gfQorCisjaW5jbHVkZSA8Y2hyb25vPgorI2luY2x1 ZGUgPGZzdHJlYW0+CisjaW5jbHVkZSA8dGVzdHN1aXRlX2hvb2tzLmg+CisKK3N0YXRpYyBib29s IG92ZXJyaWRlX3VzZWQgPSBmYWxzZTsKKworbmFtZXNwYWNlIF9fZ251X2N4eAoreworICBjb25z dCBjaGFyKiB6b25laW5mb19kaXJfb3ZlcnJpZGUoKSB7CisgICAgb3ZlcnJpZGVfdXNlZCA9IHRy dWU7CisgICAgcmV0dXJuICIuLyI7CisgIH0KK30KKwordXNpbmcgbmFtZXNwYWNlIHN0ZDo6Y2hy b25vOworCit2b2lkCit0ZXN0X2xpbmtfY2hhaW5zKCkKK3sKKyAgc3RkOjpvZnN0cmVhbSgidHpk YXRhLnppIikgPDwgUiIoIyB2ZXJzaW9uIHRlc3RfMQorTGluayAgR3JlZW53aWNoICBHX01fVAor TGluayAgRXRjL0dNVCAgICBHcmVlbndpY2gKK1pvbmUgIEV0Yy9HTVQgIDAgIC0gIEdNVAorWm9u ZSAgQV9ab25lICAgMSAgLSAgWk9OCitMaW5rICBBX1pvbmUgTDEKK0xpbmsgIEwxIEwyCitMaW5r ICBMMiBMMworTGluayAgTDMgTDQKK0xpbmsgIEw0IEw1CitMaW5rICBMNSBMNgorTGluayAgTDMg TDcKKykiOworCisgIGNvbnN0IGF1dG8mIGRiID0gcmVsb2FkX3R6ZGIoKTsKKyAgVkVSSUZZKCBv dmVycmlkZV91c2VkICk7IC8vIElmIHRoaXMgZmFpbHMgdGhlbiBYRkFJTCBmb3IgdGhlIHRhcmdl dC4KKyAgVkVSSUZZKCBkYi52ZXJzaW9uID09ICJ0ZXN0XzEiICk7CisKKyAgLy8gU2ltcGxlIGNh c2Ugb2YgYSBsaW5rIHdpdGggYSB6b25lIGFzIGl0cyB0YXJnZXQuCisgIFZFUklGWSggbG9jYXRl X3pvbmUoIkdyZWVud2ljaCIpLT5uYW1lKCkgPT0gIkV0Yy9HTVQiICk7CisgIC8vIENoYWlucyBv ZiBsaW5rcywgd2hlcmUgdGhlIHRhcmdldCBtYXkgYmUgYW5vdGhlciBsaW5rLgorICBWRVJJRlko IGxvY2F0ZV96b25lKCJHX01fVCIpLT5uYW1lKCkgPT0gIkV0Yy9HTVQiICk7CisgIFZFUklGWSgg bG9jYXRlX3pvbmUoIkwxIiktPm5hbWUoKSA9PSAiQV9ab25lIiApOworICBWRVJJRlkoIGxvY2F0 ZV96b25lKCJMMiIpLT5uYW1lKCkgPT0gIkFfWm9uZSIgKTsKKyAgVkVSSUZZKCBsb2NhdGVfem9u ZSgiTDMiKS0+bmFtZSgpID09ICJBX1pvbmUiICk7CisgIFZFUklGWSggbG9jYXRlX3pvbmUoIkw0 IiktPm5hbWUoKSA9PSAiQV9ab25lIiApOworICBWRVJJRlkoIGxvY2F0ZV96b25lKCJMNSIpLT5u YW1lKCkgPT0gIkFfWm9uZSIgKTsKKyAgVkVSSUZZKCBsb2NhdGVfem9uZSgiTDYiKS0+bmFtZSgp ID09ICJBX1pvbmUiICk7CisgIFZFUklGWSggbG9jYXRlX3pvbmUoIkw3IiktPm5hbWUoKSA9PSAi QV9ab25lIiApOworfQorCit2b2lkCit0ZXN0X2JhZF9saW5rcygpCit7CisgIC8vIFRoZSB6aWMo OCkgbWFuIHBhZ2Ugc2F5cworICAvLyA+IHRoZSBiZWhhdmlvciBpcyB1bnNwZWNpZmllZCBpZiBt dWx0aXBsZSB6b25lIG9yIGxpbmsgbGluZXMKKyAgLy8gPiBkZWZpbmUgdGhlIHNhbWUgbmFtZSIK KyAgLy8gRm9yIGxpYnN0ZGMrKyB0aGUgZXhwZWN0ZWQgYmVoYXZpb3VyIGlzIGRlc2NyaWJlZCBh bmQgdGVzdGVkIGJlbG93LgorICBzdGQ6Om9mc3RyZWFtKCJ0emRhdGEuemkiKSA8PCBSIigjIHZl cnNpb24gdGVzdF8yCitab25lIEFfWm9uZSAgIDEgIC0gIFpBCitab25lIEJfWm9uZSAgIDIgIC0g IFpCCitMaW5rIEFfWm9uZSBCX1pvbmUKK0xpbmsgQl9ab25lIENfTGluaworTGluayBDX0xpbmsg RF9MaW5rCitMaW5rIERfTGluayBFX0xpbmsKKykiOworCisgIGNvbnN0IGF1dG8mIGRiMiA9IHJl bG9hZF90emRiKCk7CisgIFZFUklGWSggb3ZlcnJpZGVfdXNlZCApOyAvLyBJZiB0aGlzIGZhaWxz IHRoZW4gWEZBSUwgZm9yIHRoZSB0YXJnZXQuCisgIFZFUklGWSggZGIyLnZlcnNpb24gPT0gInRl c3RfMiIgKTsKKworICAvLyBUaGUgc3RhbmRhcmQgcmVxdWlyZXMgbG9jYXRlX3pvbmUobmFtZSkg dG8gc2VhcmNoIGZvciBhIHpvbmUgZmlyc3QsCisgIC8vIHNvIHRoaXMgZmluZHMgdGhlIHpvbmUg Ql9ab25lLCBub3QgdGhlIGxpbmsgdGhhdCBwb2ludHMgdG8gem9uZSBBX1pvbmUuCisgIFZFUklG WSggbG9jYXRlX3pvbmUoIkJfWm9uZSIpLT5uYW1lKCkgPT0gIkJfWm9uZSIgKTsKKyAgLy8gQW5k IGxpYnN0ZGMrKyBkb2VzIHRoZSBzYW1lIGF0IGV2ZXJ5IHN0ZXAgd2hlbiBmb2xsb3dpbmcgY2hh aW5lZCBsaW5rczoKKyAgVkVSSUZZKCBsb2NhdGVfem9uZSgiQ19MaW5rIiktPm5hbWUoKSA9PSAi Ql9ab25lIiApOworICBWRVJJRlkoIGxvY2F0ZV96b25lKCJEX0xpbmsiKS0+bmFtZSgpID09ICJC X1pvbmUiICk7CisgIFZFUklGWSggbG9jYXRlX3pvbmUoIkVfTGluayIpLT5uYW1lKCkgPT0gIkJf Wm9uZSIgKTsKKworICAvLyBUaGUgemljKDgpIG1hbiBwYWdlIHNheXMKKyAgLy8gPiB0aGUgYmVo YXZpb3IgaXMgdW5zcGVjaWZpZWQgaWYgYSBjaGFpbiBvZiBvbmUgb3IgbW9yZSBsaW5rcworICAv LyA+IGRvZXMgbm90IHRlcm1pbmF0ZSBpbiBhIFpvbmUgbmFtZS4KKyAgLy8gRm9yIGxpYnN0ZGMr KyB3ZSB0aHJvdyBzdGQ6OnJ1bnRpbWVfZXJyb3IgaWYgbG9jYXRlX3pvbmUgZmluZHMgYW4KKyAg Ly8gdW50ZXJtaW5hdGVkIGNoYWluLCBpbmNsdWRpbmcgdGhlIGNhc2Ugb2YgYSBjaGFpbiB0aGF0 IGluY2x1ZGVzIGEgY3ljbGUuCisgIHN0ZDo6b2ZzdHJlYW0oInR6ZGF0YS56aSIpIDw8IFIiKCMg dmVyc2lvbiB0ZXN0XzMKK1pvbmUgQV9ab25lICAgMSAgLSAgWk9OCitMaW5rIEFfWm9uZSBHb29k TGluaworTGluayBOb19ab25lIEJhZExpbmsKK0xpbmsgTGlua1NlbGYgTGlua1NlbGYKK0xpbmsg TGlua1NlbGYgTGluazEKK0xpbmsgTGluazEgTGluazIKK0xpbmsgQ3ljbGUyX0EgQ3ljbGUyX0IK K0xpbmsgQ3ljbGUyX0IgQ3ljbGUyX0EKK0xpbmsgQ3ljbGUzX0EgQ3ljbGUzX0IKK0xpbmsgQ3lj bGUzX0IgQ3ljbGUzX0MKK0xpbmsgQ3ljbGUzX0MgQ3ljbGUzX0EKK0xpbmsgQ3ljbGUzX0MgQ3lj bGUzX0QKK0xpbmsgQ3ljbGU0X0EgQ3ljbGU0X0IKK0xpbmsgQ3ljbGU0X0IgQ3ljbGU0X0MKK0xp bmsgQ3ljbGU0X0MgQ3ljbGU0X0QKK0xpbmsgQ3ljbGU0X0QgQ3ljbGU0X0EKKykiOworCisgIGNv bnN0IGF1dG8mIGRiMyA9IHJlbG9hZF90emRiKCk7CisgIFZFUklGWSggZGIzLnZlcnNpb24gPT0g InRlc3RfMyIgKTsKKworICAvLyBMb29rdXAgZm9yIHZhbGlkIGxpbmtzIHNob3VsZCBzdGlsbCB3 b3JrIGV2ZW4gaWYgb3RoZXIgbGlua3MgYXJlIGJhZC4KKyAgVkVSSUZZKCBsb2NhdGVfem9uZSgi R29vZExpbmsiKS0+bmFtZSgpID09ICJBX1pvbmUiICk7CisKKyNpZiBfX2NwcF9leGNlcHRpb25z CisgIHRyeSB7CisgICAgbG9jYXRlX3pvbmUoIkJhZExpbmsiKTsKKyAgICBWRVJJRlkoIGZhbHNl ICk7CisgIH0gY2F0Y2ggKGNvbnN0IHN0ZDo6cnVudGltZV9lcnJvciYgZSkgeworICAgIHN0ZDo6 c3RyaW5nX3ZpZXcgd2hhdChlLndoYXQoKSk7CisgICAgVkVSSUZZKCB3aGF0LmVuZHNfd2l0aCgi Y2Fubm90IGxvY2F0ZSB6b25lOiBCYWRMaW5rIikgKTsKKyAgfQorCisgIC8vIExpbmtTZWxmIGZv cm1zIGEgbGluayBjeWNsZSB3aXRoIGl0c2VsZi4KKyAgdHJ5IHsKKyAgICBsb2NhdGVfem9uZSgi TGlua1NlbGYiKTsKKyAgICBWRVJJRlkoIGZhbHNlICk7CisgIH0gY2F0Y2ggKGNvbnN0IHN0ZDo6 cnVudGltZV9lcnJvciYgZSkgeworICAgIHN0ZDo6c3RyaW5nX3ZpZXcgd2hhdChlLndoYXQoKSk7 CisgICAgVkVSSUZZKCB3aGF0LmVuZHNfd2l0aCgibGluayBjeWNsZTogTGlua1NlbGYiKSApOwor ICB9CisKKyAgLy8gQW55IGNoYWluIHRoYXQgbGVhZHMgdG8gTGlua1NlbGYgcmVhY2hlcyBhIGN5 Y2xlLgorICB0cnkgeworICAgIGxvY2F0ZV96b25lKCJMaW5rMSIpOworICAgIFZFUklGWSggZmFs c2UgKTsKKyAgfSBjYXRjaCAoY29uc3Qgc3RkOjpydW50aW1lX2Vycm9yJiBlKSB7CisgICAgc3Rk OjpzdHJpbmdfdmlldyB3aGF0KGUud2hhdCgpKTsKKyAgICBWRVJJRlkoIHdoYXQuZW5kc193aXRo KCJsaW5rIGN5Y2xlOiBMaW5rMSIpICk7CisgIH0KKworICB0cnkgeworICAgIGxvY2F0ZV96b25l KCJMaW5rMiIpOworICAgIFZFUklGWSggZmFsc2UgKTsKKyAgfSBjYXRjaCAoY29uc3Qgc3RkOjpy dW50aW1lX2Vycm9yJiBlKSB7CisgICAgc3RkOjpzdHJpbmdfdmlldyB3aGF0KGUud2hhdCgpKTsK KyAgICBWRVJJRlkoIHdoYXQuZW5kc193aXRoKCJsaW5rIGN5Y2xlOiBMaW5rMiIpICk7CisgIH0K KworICAvLyBDeWNsZTJfQSBhbmQgQ3ljbGUyX0IgZm9ybSBhIGN5Y2xlIG9mIGxlbmd0aCB0d28u CisgIHRyeSB7CisgICAgbG9jYXRlX3pvbmUoIkN5Y2xlMl9BIik7CisgICAgVkVSSUZZKCBmYWxz ZSApOworICB9IGNhdGNoIChjb25zdCBzdGQ6OnJ1bnRpbWVfZXJyb3ImIGUpIHsKKyAgICBzdGQ6 OnN0cmluZ192aWV3IHdoYXQoZS53aGF0KCkpOworICAgIFZFUklGWSggd2hhdC5lbmRzX3dpdGgo ImxpbmsgY3ljbGU6IEN5Y2xlMl9BIikgKTsKKyAgfQorCisgIHRyeSB7CisgICAgbG9jYXRlX3pv bmUoIkN5Y2xlMl9CIik7CisgICAgVkVSSUZZKCBmYWxzZSApOworICB9IGNhdGNoIChjb25zdCBz dGQ6OnJ1bnRpbWVfZXJyb3ImIGUpIHsKKyAgICBzdGQ6OnN0cmluZ192aWV3IHdoYXQoZS53aGF0 KCkpOworICAgIFZFUklGWSggd2hhdC5lbmRzX3dpdGgoImxpbmsgY3ljbGU6IEN5Y2xlMl9CIikg KTsKKyAgfQorCisgIC8vIEN5Y2xlM19BLCBDeWNsZTNfQiBhbmQgQ3ljbGUzX0MgZm9ybSBhIGN5 Y2xlIG9mIGxlbmd0aCB0aHJlZS4KKyAgdHJ5IHsKKyAgICBsb2NhdGVfem9uZSgiQ3ljbGUzX0Ei KTsKKyAgICBWRVJJRlkoIGZhbHNlICk7CisgIH0gY2F0Y2ggKGNvbnN0IHN0ZDo6cnVudGltZV9l cnJvciYgZSkgeworICAgIHN0ZDo6c3RyaW5nX3ZpZXcgd2hhdChlLndoYXQoKSk7CisgICAgVkVS SUZZKCB3aGF0LmVuZHNfd2l0aCgibGluayBjeWNsZTogQ3ljbGUzX0EiKSApOworICB9CisKKyAg dHJ5IHsKKyAgICBsb2NhdGVfem9uZSgiQ3ljbGUzX0IiKTsKKyAgICBWRVJJRlkoIGZhbHNlICk7 CisgIH0gY2F0Y2ggKGNvbnN0IHN0ZDo6cnVudGltZV9lcnJvciYgZSkgeworICAgIHN0ZDo6c3Ry aW5nX3ZpZXcgd2hhdChlLndoYXQoKSk7CisgICAgVkVSSUZZKCB3aGF0LmVuZHNfd2l0aCgibGlu ayBjeWNsZTogQ3ljbGUzX0IiKSApOworICB9CisKKyAgdHJ5IHsKKyAgICBsb2NhdGVfem9uZSgi Q3ljbGUzX0MiKTsKKyAgICBWRVJJRlkoIGZhbHNlICk7CisgIH0gY2F0Y2ggKGNvbnN0IHN0ZDo6 cnVudGltZV9lcnJvciYgZSkgeworICAgIHN0ZDo6c3RyaW5nX3ZpZXcgd2hhdChlLndoYXQoKSk7 CisgICAgVkVSSUZZKCB3aGF0LmVuZHNfd2l0aCgibGluayBjeWNsZTogQ3ljbGUzX0MiKSApOwor ICB9CisKKyAgLy8gQ3ljbGUzX0QgaXNuJ3QgcGFydCBvZiB0aGUgY3ljbGUsIGJ1dCBpdCBsZWFk cyB0byBpdC4KKyAgdHJ5IHsKKyAgICBsb2NhdGVfem9uZSgiQ3ljbGUzX0QiKTsKKyAgICBWRVJJ RlkoIGZhbHNlICk7CisgIH0gY2F0Y2ggKGNvbnN0IHN0ZDo6cnVudGltZV9lcnJvciYgZSkgewor ICAgIHN0ZDo6c3RyaW5nX3ZpZXcgd2hhdChlLndoYXQoKSk7CisgICAgVkVSSUZZKCB3aGF0LmVu ZHNfd2l0aCgibGluayBjeWNsZTogQ3ljbGUzX0QiKSApOworICB9CisKKyAgLy8gQ3ljbGU0Xyog bGlua3MgZm9ybSBhIGN5Y2xlIG9mIGxlbmd0aCBmb3VyLgorICB0cnkgeworICAgIGxvY2F0ZV96 b25lKCJDeWNsZTRfQSIpOworICAgIFZFUklGWSggZmFsc2UgKTsKKyAgfSBjYXRjaCAoY29uc3Qg c3RkOjpydW50aW1lX2Vycm9yJiBlKSB7CisgICAgc3RkOjpzdHJpbmdfdmlldyB3aGF0KGUud2hh dCgpKTsKKyAgICBWRVJJRlkoIHdoYXQuZW5kc193aXRoKCJsaW5rIGN5Y2xlOiBDeWNsZTRfQSIp ICk7CisgIH0KKyNlbmRpZgorfQorCitpbnQgbWFpbigpCit7CisgIHRlc3RfbGlua19jaGFpbnMo KTsKKyAgdGVzdF9iYWRfbGlua3MoKTsKK30K --0000000000008db3f4061678a660--