Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xKHHz-00000000loA-20YH for pgsql-bugs@arkaria.postgresql.org; Fri, 23 Oct 2026 15:34:40 +0000 Received: from localhost ([127.0.0.1]:38054 helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.98.2) (envelope-from ) id 1xKHHx-0000000GIdZ-1xsf for pgsql-bugs@arkaria.postgresql.org; Fri, 23 Oct 2026 15:34:37 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]:34188) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xKHHw-0000000GIdR-42AE for pgsql-bugs@lists.postgresql.org; Fri, 23 Oct 2026 15:34:37 +0000 Received: from mail-vs1-xe2a.google.com ([2607:f8b0:4864:20::e2a]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98.2) (envelope-from ) id 1xKHHu-00000000aBi-0T37 for pgsql-bugs@lists.postgresql.org; Fri, 23 Oct 2026 15:34:35 +0000 Received: by mail-vs1-xe2a.google.com with SMTP id ada2fe7eead31-7c33cc572e6so814125137.1 for ; Fri, 23 Oct 2026 08:34:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792769673; x=1793374473; darn=lists.postgresql.org; h=in-reply-to:references:to:from:subject:cc:message-id:date :mime-version:content-type:from:to:cc:subject:date:message-id :reply-to:content-type; bh=3zji4BfeQFSFeZuBffTO00Mwa8CuAYatmrX+hh3RmZo=; b=aPp632CesvVZ2zo+Gm2iPsIzztdTfl2u8MICdjh9WUiUuzHlit1WjdGAnzt0eHbrV2 LwhSLupmaO/rIgodUqj7jvsGcTN5RR6Os+du7JPryOeJbYMEMQ824puLBJ4dq2PKTp96 kSq7u8HR0coPOjurfru+7nsdZl8oKhvBb6UX/uKkMavhX+gu2Q19eR7y1RzHKynzcErz c+JLprJ2I7ZfyHNaz7vgUmEuQVx63iMWbpbCSc+m7Tf0+ZoZyc73uvlLov8L8h+t5kJw vB1qy9gl8qs2syBcbW4NsVZWR2m0t7bnrmQJOLJumyMSpNmyvOpIEc9rqlX+KiQ5v5Mm F8oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792769673; x=1793374473; h=in-reply-to:references:to:from:subject:cc:message-id:date :mime-version:content-type:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to:content-type; bh=3zji4BfeQFSFeZuBffTO00Mwa8CuAYatmrX+hh3RmZo=; b=c/etk3D1l2aqRqotZsqA1l1iMZLG8fTyr30vyo5qTdUQLTNDhnxQ2vDQ/pOmDQmNl8 27f4Rl7u3gI1HfWjyYWFxOpLOGw5EccUOfV6O49hvPOrLyO5iTWfh7jmgao19h4PuzeD NvuBdu3hwpg5NCfYrN7/dqUFdFSiWjbCnQenJ54tIvM7hXKbA+QGDePuxeXJZD38mZPj Th65PHbVHGn8tnnKrD2rFlw5lRn9frqzb0g/0YWk+rjxnCyDvuNqWAmxYTZVrmwhwIFG 1lpz0A/gM7pYj6hlYahnxPRs1u+uALr2X25DZl0GRO4HD1IJFthUxS1dXKHQh9FV9t3h ebeA== X-Forwarded-Encrypted: i=1; AKwUvBxZtcnMEMp5p8WP8zcCij9v0Ra+i/D37uOgQLjFTIZup2Z9KGxnsWbIoky0NCoLmXruG/mjCdvACxSt@lists.postgresql.org X-Gm-Message-State: AFq9FYLlT21Sr8bTLX/0C6tpAHVVfU23kZgag+nqjaqLq74LR52VZPDw znyW+D1f8V+15NOu+bi4hOkGOviOdRg/u68BlYIGLgiG3H6c+UFEfLNK X-Gm-Gg: AYBFou03+0z62HVjou+kI3/DknqZY47dWhsMPQAWR4qbPNTuSMadDplfdDvR31H1+2J 1sU5zY477vvaR8PmFPPn0InqmMzEWfBgKudfd0CLZmii9hmv6fvLnKlkR6c+rJ37nk2qfJW8TkU Z/F8JY1NrPlhYuWavi/Gi9FnVVfeESfD1zd14MnMz26t5bkILEa91/zXHYIpdFzHTi50BuAEBVE rmE0c33yR2Tx4IHacJpclqJqleWf+56ct83Z99rMYvNOu41Dd5yK5w9srodv2HkI6G0JmcxWozq pLlq9oLkaHuC6d3qYIlVCOuY8Brd/qqLrXtG7zATQDilpBGXspmWmVMIQZ1GD01YerBvmQOpgj9 Wy3EpCDRosR+xHe7cIOxkkBZEP0bWNC/kucaYhVWxJ/WZDTfbhBCGKMKsH/o0vzmgUk55aelrF+ 6r0JuhfYnxdGwfMNhY+3te85N1+nhGXee9IZyrakxpwXYz6Zx6lb69SUnPxffJQ3UdJft32bZHC hOEcMFwIdmzQMb1hxe/+PEX093Bw8xaGUkLrP0KPneUWjTBM0+2QgkoOdFYIUiRtdnnfv+fzNFz wqc= X-Received: by 2002:a05:6102:5093:b0:7cc:14d:52e4 with SMTP id ada2fe7eead31-7cca9a15247mr1520238137.8.1792769672850; Fri, 23 Oct 2026 08:34:32 -0700 (PDT) Received: from localhost ([2804:14d:32a7:4273:a8d9:706e:dfe5:b29f]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-9910c064874sm632364241.12.2026.10.23.08.34.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Oct 2026 08:34:32 -0700 (PDT) Content-Type: multipart/mixed; boundary=fab324f90f2891d1e3a5e28e9e44b331687c01e8f70295064c92edad371f Mime-Version: 1.0 Date: Fri, 23 Oct 2026 12:34:28 -0300 Message-Id: Cc: , , "Richard Guo" Subject: Re: BUG #19752: GROUP BY on a constant and a cast to a length-limited array type crashes the server while planning From: "Matheus Alcantara" To: "Andrey Rachitskiy" , "Tom Lane" X-Mailer: aerc 0.21.0 References: <19752-928339cd23b58a33@postgresql.org> <2530849.1791487908@sss.pgh.pa.us> <2533535.1791490239@sss.pgh.pa.us> In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --fab324f90f2891d1e3a5e28e9e44b331687c01e8f70295064c92edad371f Content-Type: multipart/alternative; boundary=e19f5e4cbf6bf5c5e6060c568fe4fee79aa6351e99785926a91456c84f0e --e19f5e4cbf6bf5c5e6060c568fe4fee79aa6351e99785926a91456c84f0e Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Content-Type: text/plain; charset=UTF-8 On Thu Oct 8, 2026 at 6:21 PM -03, Andrey Rachitskiy wrote: > =D0=BF=D1=82, 9 =D0=BE=D0=BA=D1=82. 2026=E2=80=AF=D0=B3. =D0=B2 01:10, To= m Lane : >> > Skipping every GROUP BY item that contains no level-zero Var is too >> > broad. The item in that query is a Const, so it contains no Var, and >> > the commit exists to keep it a candidate. The constants that must not >> > be replaced are the other Const nodes that happen to compare equal. >> >> We might need to special-case TLEs that are identified this way. >> The basic problem is how do you tell which Consts are okay to replace, >> and what I'm saying is "none of them, except the identified TLE". >> >> > Agreed. > > None of the Consts should be replaced, except the targetlist > entry that GROUP BY identified. > > That entry already carries a ressortgroupref. When its expression is a > Const or Param, substitute_grouped_columns_mutator() replaces the entry > as a whole. The match is on ressortgroupref, because groupClauses may > be a copy after join alias flattening. These items are skipped in the > equal() loop, so the same value elsewhere stays a constant. Param > takes the same path as Const, since the existing code accepts the two > together. > > select 1 as one group by rollup(one) order by one nulls first still > returns a null row and then 1. > select 1 as one, 1+2 as three group by rollup(one) leaves three as 3. > > The reported query no longer crashes. > > GROUP BY true identified the boolean constant, and the true inside > ArrayCoerceExpr.elemexpr was a different Const. > > Patch attached. Hi, Thanks for working on this! I've reviewed the attached patch and I have a few comments: 1. It seems to me that the test group by cast(500 as int) exercises nothing. This test pass on master and on 18. I think that it's because the typmod for varchar(500) is 504, so changing to CAST(504 as int) trigger the issue. 2. Three of the new tests don't use grouping sets, so I'm wondering if aggregates.sql may be a better home for them. 3. I think that the check on substitute_grouped_columns_mutator can be written as: if (context->sublevels_up =3D=3D 0 && context->have_non_var_grouping && IsA(node, TargetEntry) && ((TargetEntry *) node)->ressortgroupref !=3D 0) { TargetEntry *tle =3D (TargetEntry *) node; int attnum =3D 0; foreach(gl, context->groupClauses) { TargetEntry *grouptle =3D (TargetEntry *) lfirst(gl); attnum++; if (tle->ressortgroupref =3D=3D grouptle->ressortgroupref && (IsA(grouptle->expr, Const) || IsA(grouptle->expr, Param))) ... Because most targetlist entries aren't GROUP BY, ORDER BY or DISTINCT keys, so their ressortgroupref is 0. For those, the loop can never match, but it still walks the whole groupClauses list. The grouptle->ressortgroupref !=3D 0 test inside the loop seems also redundant since an item in groupClauses always has a nonzero ressortgroupref, because that's how it was looked up. What it guards against is tle->ressortgroupref being 0, and that can be checked once, outside the loop. 4. I think that the patch only covers part of what Tom suggested. IIUC his first suggestion was that GROUP BY items should not be candidates for the search-and-replace unless they contain at least one level-zero Var, and then "none of them, except the identified TLE". The patch applies this only to plain Const and Param nodes, so other Var-free items like 1+2, now(), an uncorrelated sublink or an outer reference still go through the equal() matching. For example, with: select 1+2 as three, (1+2)*10 as x group by rollup(three); the 1+2 inside x is still replaced by a nullable grouped Var on the parse tree. The result is correct today only because the planner happens to not null it, which IIUC is the "it does not, right now" case that Tom mentioned. The crash itself can't come back through these items, since elemexpr only contains CaseTestExpr and Consts, but it seems to me that the rule should be based on what the item contains rather than on its node type. Based on this I'm attaching a v2 that implements Tom's suggestion. It's based on the same idea of matching the identified TLE by ressortgroupref from your patch. The main changes are: - parseCheckAggregates() records in a Bitmapset which GROUP BY items contain no Vars of the current query level, using contain_vars_of_level(expr, 0). - For those items, only the targetlist entry that GROUP BY identified is replaced as a whole, and they are skipped in the equal() loop at every sublevel. - Since a Const or Param can no longer match any grouping item, the early return for them is moved back to the top of the mutator, as it was before f5050f795ae. -- Matheus Alcantara EDB: https://www.enterprisedb.com --e19f5e4cbf6bf5c5e6060c568fe4fee79aa6351e99785926a91456c84f0e-- --fab324f90f2891d1e3a5e28e9e44b331687c01e8f70295064c92edad371f Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=v2-0001-Don-t-replace-Var-free-subexpressions-with-groupe.patch Content-Type: text/plain; charset=utf-8; name=v2-0001-Don-t-replace-Var-free-subexpressions-with-groupe.patch RnJvbSBhNjEyYTIyNDg2NDg2ZWVkMDUxMWRlNWZiNzI3NjI1OTZkM2Q2MjA5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXRoZXVzIEFsY2FudGFyYSA8bXRocy5kZXZAcG0ubWU+CkRh dGU6IEZyaSwgMjMgT2N0IDIwMjYgMTI6MTY6NTAgLTAzMDAKU3ViamVjdDogW1BBVENIIHYyXSBE b24ndCByZXBsYWNlIFZhci1mcmVlIHN1YmV4cHJlc3Npb25zIHdpdGggZ3JvdXBlZCBWYXJzCgpT aW5jZSBmNTA1MGY3OTVhZSwgc3Vic3RpdHV0ZV9ncm91cGVkX2NvbHVtbnNfbXV0YXRvcigpIGNo ZWNrcyBldmVyeQpzdWJleHByZXNzaW9uIGFnYWluc3QgdGhlIEdST1VQIEJZIGl0ZW1zIHdpdGgg ZXF1YWwoKSBiZWZvcmUgYWNjZXB0aW5nCkNvbnN0cyBhbmQgUGFyYW1zLCBzbyB0aGF0IGEgY29u c3RhbnQgZ3JvdXBpbmcgaXRlbSBpcyBtYXJrZWQgbnVsbGFibGUKYnkgZ3JvdXBpbmcgc2V0cy4g QnV0IHRoYXQgYWxzbyByZXBsYWNlcyBhbnkgb3RoZXIgQ29uc3QgdGhhdCBtZXJlbHkKaGFwcGVu cyB0byBiZSBlcXVhbCB0byBhIGNvbnN0YW50IGdyb3VwaW5nIGl0ZW0uIFN1Y2ggYSBDb25zdCBt YXkgYmUgaW4KYSBwbGFjZSB3aGVyZSBWYXJzIGFyZSBub3QgYWxsb3dlZCwgc3VjaCBhcyB0aGUg ZWxlbWV4cHIgb2YgYW4KQXJyYXlDb2VyY2VFeHByLCB3aGVyZSB0aGUgaXNFeHBsaWNpdCBmbGFn IG9mIGEgbGVuZ3RoLWNvZXJjaW9uIGZ1bmN0aW9uCmlzIGEgYm9vbGVhbiBDb25zdC4gRm9yIGV4 YW1wbGU6CgpTRUxFQ1QgQVJSQVlbXTo6dmFyY2hhcig1MDApW10gR1JPVVAgQlkgQ0FTVCgndHJ1 ZScgQVMgYm9vbGVhbik7CgpjcmFzaGVkIHRoZSBwbGFubmVyLCBiZWNhdXNlIGNvbnN0YW50LWZv bGRpbmcgZXZhbHVhdGVkIGEgVmFyIHdpdGhvdXQgYQp0dXBsZSBzbG90LgoKQSBncm91cGluZyBl eHByZXNzaW9uIHRoYXQgY29udGFpbnMgbm8gVmFycyBvZiB0aGUgY3VycmVudCBxdWVyeSBsZXZl bAppcyBub3QgYSByZWZlcmVuY2UgdG8gYW55IGNvbHVtbiBvZiB0aGUgaW5wdXQsIHNvIGFuIGVx dWFsIGV4cHJlc3Npb24KZWxzZXdoZXJlIGluIHRoZSBxdWVyeSBpcyBub3QgYSByZWZlcmVuY2Ug dG8gdGhhdCBncm91cGluZyBjb2x1bW4uIFRyZWF0CnN1Y2ggZ3JvdXBpbmcgZXhwcmVzc2lvbnMg YXMgcmVmZXJyaW5nIG9ubHkgdG8gdGhlIHRhcmdldGxpc3QgZW50cnkgdGhhdApHUk9VUCBCWSBp ZGVudGlmaWVkOiByZXBsYWNlIHRoYXQgZW50cnkgYXMgYSB3aG9sZSwgYW5kIGxlYXZlIHRoZW0g b3V0Cm9mIHRoZSBlcXVhbCgpIG1hdGNoaW5nIGFsdG9nZXRoZXIuIFRoaXMgY292ZXJzIGNvbnN0 YW50cywgUGFyYW1zLCBvdXRlcgpyZWZlcmVuY2VzIGFuZCBWYXItZnJlZSBleHByZXNzaW9ucyBz dWNoIGFzIDErMi4gV2l0aCB0aGF0LCBhIENvbnN0IG9yClBhcmFtIG5vZGUgY2FuIG5ldmVyIG1h dGNoIGEgZ3JvdXBpbmcgaXRlbSwgc28gYWNjZXB0IHRoZW0gYXQgdGhlIHRvcCBvZgp0aGUgbXV0 YXRvciBhZ2FpbiwgYXMgYmVmb3JlIGY1MDUwZjc5NWFlLgoKQXV0aG9yOiBBbmRyZXkgUmFjaGl0 c2tpeSA8cGwwaDB5cDFAZ21haWwuY29tPgpDby1hdXRob3JlZC1ieTogTWF0aGV1cyBBbGNhbnRh cmEgPG1hdGhldXNzc2lsdjk3QGdtYWlsLmNvbT4KLS0tCiBzcmMvYmFja2VuZC9wYXJzZXIvcGFy c2VfYWdnLmMgICAgICAgICAgICAgfCA3NCArKysrKysrKysrKysrKysrKysrLS0tCiBzcmMvdGVz dC9yZWdyZXNzL2V4cGVjdGVkL2dyb3VwaW5nc2V0cy5vdXQgfCA1NiArKysrKysrKysrKysrKysr CiBzcmMvdGVzdC9yZWdyZXNzL3NxbC9ncm91cGluZ3NldHMuc3FsICAgICAgfCAyMCArKysrKysK IDMgZmlsZXMgY2hhbmdlZCwgMTQwIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3BhcnNlci9wYXJzZV9hZ2cuYyBiL3NyYy9iYWNrZW5kL3Bh cnNlci9wYXJzZV9hZ2cuYwppbmRleCBhNTQyNGM5ZDI0Yy4uYWY1NGQ2ZDU3NmEgMTAwNjQ0Ci0t LSBhL3NyYy9iYWNrZW5kL3BhcnNlci9wYXJzZV9hZ2cuYworKysgYi9zcmMvYmFja2VuZC9wYXJz ZXIvcGFyc2VfYWdnLmMKQEAgLTUzLDYgKzUzLDggQEAgdHlwZWRlZiBzdHJ1Y3QKIAlMaXN0CSAg ICpncm91cENsYXVzZVN1YkxldmVsczsJLyogbGlzdCBvZiBsaXN0cyBvZiBUYXJnZXRFbnRyeSAq LwogCUxpc3QJICAgKmdzZXRfY29tbW9uOwkvKiBpbnRlZ2VyIGxpc3Qgb2Ygc29ydGdyb3VwcmVm cyAqLwogCWJvb2wJCWhhdmVfbm9uX3Zhcl9ncm91cGluZzsKKwlCaXRtYXBzZXQgICp2YXJmcmVl X2dyb3VwaW5nOwkvKiBncm91cENsYXVzZXMgaXRlbXMgd2l0aCBubyBsZXZlbC16ZXJvCisJCQkJ CQkJCQkgKiBWYXJzLCBieSBwb3NpdGlvbiAqLwogCUxpc3QJICAqKmZ1bmNfZ3JvdXBlZF9yZWxz OwogCWludAkJCXN1YmxldmVsc191cDsKIAlib29sCQlpbl9hZ2dfZGlyZWN0X2FyZ3M7CkBAIC02 OSw2ICs3MSw3IEBAIHN0YXRpYyBOb2RlICpzdWJzdGl0dXRlX2dyb3VwZWRfY29sdW1ucyhOb2Rl ICpub2RlLCBQYXJzZVN0YXRlICpwc3RhdGUsIFF1ZXJ5ICpxCiAJCQkJCQkJCQkJTGlzdCAqZ3Jv dXBDbGF1c2VzLCBMaXN0ICpncm91cENsYXVzZUNvbW1vblZhcnMsCiAJCQkJCQkJCQkJTGlzdCAq Z3NldF9jb21tb24sCiAJCQkJCQkJCQkJYm9vbCBoYXZlX25vbl92YXJfZ3JvdXBpbmcsCisJCQkJ CQkJCQkJQml0bWFwc2V0ICp2YXJmcmVlX2dyb3VwaW5nLAogCQkJCQkJCQkJCUxpc3QgKipmdW5j X2dyb3VwZWRfcmVscyk7CiBzdGF0aWMgTm9kZSAqc3Vic3RpdHV0ZV9ncm91cGVkX2NvbHVtbnNf bXV0YXRvcihOb2RlICpub2RlLAogCQkJCQkJCQkJCQkJc3Vic3RpdHV0ZV9ncm91cGVkX2NvbHVt bnNfY29udGV4dCAqY29udGV4dCk7CkBAIC0xMTQyLDggKzExNDUsMTAgQEAgcGFyc2VDaGVja0Fn Z3JlZ2F0ZXMoUGFyc2VTdGF0ZSAqcHN0YXRlLCBRdWVyeSAqcXJ5KQogCUxpc3QJICAgKmdyb3Vw Q2xhdXNlcyA9IE5JTDsKIAlMaXN0CSAgICpncm91cENsYXVzZUNvbW1vblZhcnMgPSBOSUw7CiAJ Ym9vbAkJaGF2ZV9ub25fdmFyX2dyb3VwaW5nOworCUJpdG1hcHNldCAgKnZhcmZyZWVfZ3JvdXBp bmcgPSBOVUxMOwogCUxpc3QJICAgKmZ1bmNfZ3JvdXBlZF9yZWxzID0gTklMOwogCUxpc3RDZWxs ICAgKmw7CisJaW50CQkJYXR0bnVtOwogCWJvb2wJCWhhc0pvaW5SVEVzOwogCWJvb2wJCWhhc1Nl bGZSZWZSVEVzOwogCU5vZGUJICAgKmNsYXVzZTsKQEAgLTEyNjcsMTIgKzEyNzIsMjIgQEAgcGFy c2VDaGVja0FnZ3JlZ2F0ZXMoUGFyc2VTdGF0ZSAqcHN0YXRlLCBRdWVyeSAqcXJ5KQogCSAqIFRy YWNrIFZhcnMgdGhhdCBhcmUgaW5jbHVkZWQgaW4gYWxsIGdyb3VwaW5nIHNldHMgc2VwYXJhdGVs eSBpbgogCSAqIGdyb3VwQ2xhdXNlQ29tbW9uVmFycywgc2luY2UgdGhlc2UgYXJlIHRoZSBvbmx5 IG9uZXMgd2UgY2FuIHVzZSB0bwogCSAqIGNoZWNrIGZvciBmdW5jdGlvbmFsIGRlcGVuZGVuY2ll cy4KKwkgKgorCSAqIEFsc28gcmVtZW1iZXIgd2hpY2ggZ3JvdXBpbmcgZXhwcmVzc2lvbnMgY29u dGFpbiBubyBWYXJzIG9mIHRoaXMgcXVlcnkKKwkgKiBsZXZlbCAoY29uc3RhbnRzLCBQYXJhbXMs IG91dGVyIHJlZmVyZW5jZXMgYW5kIHRoZSBsaWtlKS4gIFRob3NlIGNhbgorCSAqIG9ubHkgYmUg cmVmZXJlbmNlZCB0aHJvdWdoIHRoZSB0YXJnZXRsaXN0IGVudHJ5IHRoYXQgR1JPVVAgQlkKKwkg KiBpZGVudGlmaWVkOyBzZWUgc3Vic3RpdHV0ZV9ncm91cGVkX2NvbHVtbnNfbXV0YXRvci4KIAkg Ki8KIAloYXZlX25vbl92YXJfZ3JvdXBpbmcgPSBmYWxzZTsKKwlhdHRudW0gPSAwOwogCWZvcmVh Y2gobCwgZ3JvdXBDbGF1c2VzKQogCXsKIAkJVGFyZ2V0RW50cnkgKnRsZSA9IGxmaXJzdChsKTsK IAorCQlhdHRudW0rKzsKKwkJaWYgKCFjb250YWluX3ZhcnNfb2ZfbGV2ZWwoKE5vZGUgKikgdGxl LT5leHByLCAwKSkKKwkJCXZhcmZyZWVfZ3JvdXBpbmcgPSBibXNfYWRkX21lbWJlcih2YXJmcmVl X2dyb3VwaW5nLCBhdHRudW0pOworCiAJCWlmICghSXNBKHRsZS0+ZXhwciwgVmFyKSkKIAkJewog CQkJaGF2ZV9ub25fdmFyX2dyb3VwaW5nID0gdHJ1ZTsKQEAgLTEzMDgsNiArMTMyMyw3IEBAIHBh cnNlQ2hlY2tBZ2dyZWdhdGVzKFBhcnNlU3RhdGUgKnBzdGF0ZSwgUXVlcnkgKnFyeSkKIAkJCQkJ CQkJICAgZ3JvdXBDbGF1c2VzLCBncm91cENsYXVzZUNvbW1vblZhcnMsCiAJCQkJCQkJCSAgIGdz ZXRfY29tbW9uLAogCQkJCQkJCQkgICBoYXZlX25vbl92YXJfZ3JvdXBpbmcsCisJCQkJCQkJCSAg IHZhcmZyZWVfZ3JvdXBpbmcsCiAJCQkJCQkJCSAgICZmdW5jX2dyb3VwZWRfcmVscyk7CiAKIAlj bGF1c2UgPSAoTm9kZSAqKSBxcnktPmhhdmluZ1F1YWw7CkBAIC0xMzIxLDYgKzEzMzcsNyBAQCBw YXJzZUNoZWNrQWdncmVnYXRlcyhQYXJzZVN0YXRlICpwc3RhdGUsIFF1ZXJ5ICpxcnkpCiAJCQkJ CQkJCSAgIGdyb3VwQ2xhdXNlcywgZ3JvdXBDbGF1c2VDb21tb25WYXJzLAogCQkJCQkJCQkgICBn c2V0X2NvbW1vbiwKIAkJCQkJCQkJICAgaGF2ZV9ub25fdmFyX2dyb3VwaW5nLAorCQkJCQkJCQkg ICB2YXJmcmVlX2dyb3VwaW5nLAogCQkJCQkJCQkgICAmZnVuY19ncm91cGVkX3JlbHMpOwogCiAJ LyoKQEAgLTEzNTEsNiArMTM2OCw3IEBAIHN1YnN0aXR1dGVfZ3JvdXBlZF9jb2x1bW5zKE5vZGUg Km5vZGUsIFBhcnNlU3RhdGUgKnBzdGF0ZSwgUXVlcnkgKnFyeSwKIAkJCQkJCSAgIExpc3QgKmdy b3VwQ2xhdXNlcywgTGlzdCAqZ3JvdXBDbGF1c2VDb21tb25WYXJzLAogCQkJCQkJICAgTGlzdCAq Z3NldF9jb21tb24sCiAJCQkJCQkgICBib29sIGhhdmVfbm9uX3Zhcl9ncm91cGluZywKKwkJCQkJ CSAgIEJpdG1hcHNldCAqdmFyZnJlZV9ncm91cGluZywKIAkJCQkJCSAgIExpc3QgKipmdW5jX2dy b3VwZWRfcmVscykKIHsKIAlzdWJzdGl0dXRlX2dyb3VwZWRfY29sdW1uc19jb250ZXh0IGNvbnRl eHQ7CkBAIC0xMzYzLDYgKzEzODEsNyBAQCBzdWJzdGl0dXRlX2dyb3VwZWRfY29sdW1ucyhOb2Rl ICpub2RlLCBQYXJzZVN0YXRlICpwc3RhdGUsIFF1ZXJ5ICpxcnksCiAJY29udGV4dC5ncm91cENs YXVzZVN1YkxldmVscyA9IE5JTDsKIAljb250ZXh0LmdzZXRfY29tbW9uID0gZ3NldF9jb21tb247 CiAJY29udGV4dC5oYXZlX25vbl92YXJfZ3JvdXBpbmcgPSBoYXZlX25vbl92YXJfZ3JvdXBpbmc7 CisJY29udGV4dC52YXJmcmVlX2dyb3VwaW5nID0gdmFyZnJlZV9ncm91cGluZzsKIAljb250ZXh0 LmZ1bmNfZ3JvdXBlZF9yZWxzID0gZnVuY19ncm91cGVkX3JlbHM7CiAJY29udGV4dC5zdWJsZXZl bHNfdXAgPSAwOwogCWNvbnRleHQuaW5fYWdnX2RpcmVjdF9hcmdzID0gZmFsc2U7CkBAIC0xMzc3 LDYgKzEzOTYsOSBAQCBzdWJzdGl0dXRlX2dyb3VwZWRfY29sdW1uc19tdXRhdG9yKE5vZGUgKm5v ZGUsCiAKIAlpZiAobm9kZSA9PSBOVUxMKQogCQlyZXR1cm4gTlVMTDsKKwlpZiAoSXNBKG5vZGUs IENvbnN0KSB8fAorCQlJc0Eobm9kZSwgUGFyYW0pKQorCQlyZXR1cm4gbm9kZTsJCQkvKiBjb25z dGFudHMgYXJlIGFsd2F5cyBhY2NlcHRhYmxlICovCiAKIAlpZiAoSXNBKG5vZGUsIEFnZ3JlZikp CiAJewpAQCAtMTQyNCw2ICsxNDQ2LDQyIEBAIHN1YnN0aXR1dGVfZ3JvdXBlZF9jb2x1bW5zX211 dGF0b3IoTm9kZSAqbm9kZSwKIAkJCXJldHVybiBub2RlOwogCX0KIAorCS8qCisJICogQSBncm91 cGluZyBleHByZXNzaW9uIHRoYXQgY29udGFpbnMgbm8gVmFycyBvZiB0aGlzIHF1ZXJ5IGxldmVs LCBzdWNoCisJICogYXMgYSBjb25zdGFudCwgcmVmZXJzIG9ubHkgdG8gdGhlIHRhcmdldGxpc3Qg ZW50cnkgdGhhdCBHUk9VUCBCWQorCSAqIGlkZW50aWZpZWQuICBPdGhlciBvY2N1cnJlbmNlcyBv ZiBhbiBlcXVhbCBleHByZXNzaW9uIGFyZSBub3QKKwkgKiByZWZlcmVuY2VzIHRvIHRoYXQgZ3Jv dXBpbmcgY29sdW1uLCBzbyB0aGV5IGFyZSBub3QgY2FuZGlkYXRlcyBmb3IgdGhlCisJICogZXF1 YWwoKSBtYXRjaGluZyBiZWxvdy4gIFJlcGxhY2luZyB0aGVtIHdvdWxkIGJlIHdyb25nIGFueXdh eTogdGhleSBjYW4KKwkgKiBhcHBlYXIgaW4gcGxhY2VzIHdoZXJlIFZhcnMgYXJlIG5vdCBhbGxv d2VkLCBzdWNoIGFzIHRoZSBlbGVtZXhwciBvZiBhbgorCSAqIEFycmF5Q29lcmNlRXhwci4KKwkg Ki8KKwlpZiAoSXNBKG5vZGUsIFRhcmdldEVudHJ5KSAmJgorCQkoKFRhcmdldEVudHJ5ICopIG5v ZGUpLT5yZXNzb3J0Z3JvdXByZWYgIT0gMCAmJgorCQljb250ZXh0LT5oYXZlX25vbl92YXJfZ3Jv dXBpbmcgJiYKKwkJY29udGV4dC0+c3VibGV2ZWxzX3VwID09IDApCisJeworCQlUYXJnZXRFbnRy eSAqdGxlID0gKFRhcmdldEVudHJ5ICopIG5vZGU7CisJCWludAkJCWF0dG51bSA9IDA7CisKKwkJ Zm9yZWFjaChnbCwgY29udGV4dC0+Z3JvdXBDbGF1c2VzKQorCQl7CisJCQlUYXJnZXRFbnRyeSAq Z3JvdXB0bGUgPSAoVGFyZ2V0RW50cnkgKikgbGZpcnN0KGdsKTsKKworCQkJYXR0bnVtKys7CisJ CQlpZiAoZ3JvdXB0bGUtPnJlc3NvcnRncm91cHJlZiAhPSB0bGUtPnJlc3NvcnRncm91cHJlZikK KwkJCQljb250aW51ZTsKKwkJCWlmIChibXNfaXNfbWVtYmVyKGF0dG51bSwgY29udGV4dC0+dmFy ZnJlZV9ncm91cGluZykpCisJCQl7CisJCQkJdGxlID0gZmxhdENvcHlUYXJnZXRFbnRyeSh0bGUp OworCQkJCXRsZS0+ZXhwciA9IChFeHByICopIGJ1aWxkR3JvdXBlZFZhcihhdHRudW0sCisJCQkJ CQkJCQkJCQkJIHRsZS0+cmVzc29ydGdyb3VwcmVmLAorCQkJCQkJCQkJCQkJCSBjb250ZXh0KTsK KwkJCQlyZXR1cm4gKE5vZGUgKikgdGxlOworCQkJfQorCQkJYnJlYWs7CisJCX0KKwl9CisKIAkv KgogCSAqIElmIHdlIGhhdmUgYW55IEdST1VQIEJZIGl0ZW1zIHRoYXQgYXJlIG5vdCBzaW1wbGUg VmFycywgY2hlY2sgdG8gc2VlIGlmCiAJICogc3ViZXhwcmVzc2lvbiBhcyBhIHdob2xlIG1hdGNo ZXMgYW55IEdST1VQIEJZIGl0ZW0uIFdlIG5lZWQgdG8gZG8gdGhpcwpAQCAtMTQ0OCw2ICsxNTA2 LDExIEBAIHN1YnN0aXR1dGVfZ3JvdXBlZF9jb2x1bW5zX211dGF0b3IoTm9kZSAqbm9kZSwKIAkJ CVRhcmdldEVudHJ5ICp0bGUgPSAoVGFyZ2V0RW50cnkgKikgbGZpcnN0KGdsKTsKIAogCQkJYXR0 bnVtKys7CisKKwkJCS8qIFZhci1mcmVlIGl0ZW1zIGFyZSBtYXRjaGVkIG9ubHkgYnkgdGFyZ2V0 bGlzdCBlbnRyeSwgYWJvdmUgKi8KKwkJCWlmIChibXNfaXNfbWVtYmVyKGF0dG51bSwgY29udGV4 dC0+dmFyZnJlZV9ncm91cGluZykpCisJCQkJY29udGludWU7CisKIAkJCWlmIChlcXVhbChub2Rl LCB0bGUtPmV4cHIpKQogCQkJewogCQkJCS8qIGFjY2VwdGFibGUsIHJlcGxhY2UgaXQgd2l0aCBh IEdST1VQIFZhciAqLwpAQCAtMTQ1OCwxNiArMTUyMSw2IEBAIHN1YnN0aXR1dGVfZ3JvdXBlZF9j b2x1bW5zX211dGF0b3IoTm9kZSAqbm9kZSwKIAkJfQogCX0KIAotCS8qCi0JICogQ29uc3RhbnRz IGFyZSBhbHdheXMgYWNjZXB0YWJsZS4gIFdlIGhhdmUgdG8gZG8gdGhpcyBhZnRlciB3ZSBjaGVj a2VkCi0JICogdGhlIHN1YmV4cHJlc3Npb24gYXMgYSB3aG9sZSBmb3IgYSBtYXRjaCwgYmVjYXVz ZSBpdCBpcyBwb3NzaWJsZSB0aGF0Ci0JICogd2UgaGF2ZSBHUk9VUCBCWSBpdGVtcyB0aGF0IGFy ZSBjb25zdGFudHMsIGFuZCB0aGUgY29uc3RhbnRzIHdvdWxkCi0JICogYmVjb21lIG5vdCBzbyBj b25zdGFudCBhZnRlciB0aGUgZ3JvdXBpbmcgc3RlcC4KLQkgKi8KLQlpZiAoSXNBKG5vZGUsIENv bnN0KSB8fAotCQlJc0Eobm9kZSwgUGFyYW0pKQotCQlyZXR1cm4gbm9kZTsKLQogCS8qCiAJICog SWYgd2UgaGF2ZSBhbiB1bmdyb3VwZWQgVmFyIG9mIHRoZSBvcmlnaW5hbCBxdWVyeSBsZXZlbCwg d2UgaGF2ZSBhCiAJICogZmFpbHVyZS4gIFZhcnMgYmVsb3cgdGhlIG9yaWdpbmFsIHF1ZXJ5IGxl dmVsIGFyZSBub3QgYSBwcm9ibGVtLCBhbmQKQEAgLTE2MjQsNiArMTY3Nyw3IEBAIGZpbmFsaXpl X2dyb3VwaW5nX2V4cHJzKE5vZGUgKm5vZGUsIFBhcnNlU3RhdGUgKnBzdGF0ZSwgUXVlcnkgKnFy eSwKIAljb250ZXh0Lmdyb3VwQ2xhdXNlU3ViTGV2ZWxzID0gTklMOwogCWNvbnRleHQuZ3NldF9j b21tb24gPSBOSUw7CiAJY29udGV4dC5oYXZlX25vbl92YXJfZ3JvdXBpbmcgPSBoYXZlX25vbl92 YXJfZ3JvdXBpbmc7CisJY29udGV4dC52YXJmcmVlX2dyb3VwaW5nID0gTlVMTDsKIAljb250ZXh0 LmZ1bmNfZ3JvdXBlZF9yZWxzID0gTlVMTDsKIAljb250ZXh0LnN1YmxldmVsc191cCA9IDA7CiAJ Y29udGV4dC5pbl9hZ2dfZGlyZWN0X2FyZ3MgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL3NyYy90ZXN0 L3JlZ3Jlc3MvZXhwZWN0ZWQvZ3JvdXBpbmdzZXRzLm91dCBiL3NyYy90ZXN0L3JlZ3Jlc3MvZXhw ZWN0ZWQvZ3JvdXBpbmdzZXRzLm91dAppbmRleCAwOGQ1Y2UzMTU2ZC4uNzcyNWRlYzBhNTkgMTAw NjQ0Ci0tLSBhL3NyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvZ3JvdXBpbmdzZXRzLm91dAorKysg Yi9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL2dyb3VwaW5nc2V0cy5vdXQKQEAgLTI2NjcsNiAr MjY2Nyw2MiBAQCBzZWxlY3QgMSBhcyBvbmUgZ3JvdXAgYnkgcm9sbHVwKG9uZSkgb3JkZXIgYnkg b25lIG51bGxzIGZpcnN0OwogICAgMQogKDIgcm93cykKIAorLS0gQSBncm91cGluZyBleHByZXNz aW9uIGNvbnRhaW5pbmcgbm8gVmFycyBvZiB0aGUgcXVlcnkgbGV2ZWwgcmVmZXJzIG9ubHkKKy0t IHRvIHRoZSB0YXJnZXRsaXN0IGVudHJ5IEdST1VQIEJZIGlkZW50aWZpZWQ7IGVxdWFsIGV4cHJl c3Npb25zIGVsc2V3aGVyZQorLS0gbXVzdCBub3QgYmUgcmVwbGFjZWQgYnkgZ3JvdXBlZCBWYXJz ICh0aGlzIHVzZWQgdG8gY3Jhc2gpCitzZWxlY3QgYXJyYXlbXTo6dmFyY2hhcig1MDApW10gYXMg YSBncm91cCBieSBjYXN0KCd0cnVlJyBhcyBib29sZWFuKTsKKyBhICAKKy0tLS0KKyB7fQorKDEg cm93KQorCitzZWxlY3QgYXJyYXlbXTo6dmFyY2hhcig1MDApW10gYXMgYSBncm91cCBieSA1MDQ6 OmludDQ7CisgYSAgCistLS0tCisge30KKygxIHJvdykKKworc2VsZWN0IChzZWxlY3QgYXJyYXlb XTo6dmFyY2hhcig1MDApW10pIGFzIGEKK2dyb3VwIGJ5IHJvbGx1cChjYXN0KCd0cnVlJyBhcyBi b29sZWFuKSk7CisgYSAgCistLS0tCisge30KKyB7fQorKDIgcm93cykKKworZXhwbGFpbiAodmVy Ym9zZSwgY29zdHMgb2ZmKQorc2VsZWN0IDEgYXMgYSwgMSBhcyBiLCAxKzIgYXMgYywgKDErMikq MTAgYXMgZAorZ3JvdXAgYnkgcm9sbHVwKGEsIGMpOworICAgICAgICBRVUVSWSBQTEFOICAgICAg ICAgCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyBNaXhlZEFnZ3JlZ2F0ZQorICAgT3V0 cHV0OiAoMSksIDEsICgzKSwgMzAKKyAgIEhhc2ggS2V5OiAxLCAzCisgICBIYXNoIEtleTogMQor ICAgR3JvdXAgS2V5OiAoKQorICAgLT4gIFJlc3VsdAorICAgICAgICAgT3V0cHV0OiAxLCAzCiso NyByb3dzKQorCitzZWxlY3QgMSBhcyBhLCAxIGFzIGIsIDErMiBhcyBjLCAoMSsyKSoxMCBhcyBk Citncm91cCBieSByb2xsdXAoYSwgYykKK29yZGVyIGJ5IGEgbnVsbHMgZmlyc3QsIGMgbnVsbHMg Zmlyc3Q7CisgYSB8IGIgfCBjIHwgZCAgCistLS0rLS0tKy0tLSstLS0tCisgICB8IDEgfCAgIHwg MzAKKyAxIHwgMSB8ICAgfCAzMAorIDEgfCAxIHwgMyB8IDMwCisoMyByb3dzKQorCistLSBsaWtl d2lzZSBmb3IgYW4gb3V0ZXIgcmVmZXJlbmNlIHVzZWQgYXMgYSBncm91cGluZyBleHByZXNzaW9u CitzZWxlY3QgYXJyYXkoc2VsZWN0IG8uYSBhcyBrIGZyb20gKHZhbHVlcyAoMSkpIGFzIGkgKHgp CisgICAgICAgICAgICAgZ3JvdXAgYnkgcm9sbHVwKG8uYSwgeCswKSBvcmRlciBieSAxIG51bGxz IGZpcnN0KQorZnJvbSAodmFsdWVzICgxMCkpIGFzIG8gKGEpOworICAgIGFycmF5ICAgICAKKy0t LS0tLS0tLS0tLS0tCisge05VTEwsMTAsMTB9CisoMSByb3cpCisKIGV4cGxhaW4gKGNvc3RzIG9m ZikKIHNlbGVjdCBhLCBiLCByb3dfbnVtYmVyKCkgb3ZlciAob3JkZXIgYnkgYSwgYiBudWxscyBm aXJzdCkKIGZyb20gKHZhbHVlcyAoMSwgMSksICgyLCAyKSkgYXMgdCAoYSwgYikgd2hlcmUgYSA9 IGIKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3JlZ3Jlc3Mvc3FsL2dyb3VwaW5nc2V0cy5zcWwgYi9z cmMvdGVzdC9yZWdyZXNzL3NxbC9ncm91cGluZ3NldHMuc3FsCmluZGV4IGM1ZDRlZDJlYjU3Li4y MmI4YzUxN2ZlYiAxMDA2NDQKLS0tIGEvc3JjL3Rlc3QvcmVncmVzcy9zcWwvZ3JvdXBpbmdzZXRz LnNxbAorKysgYi9zcmMvdGVzdC9yZWdyZXNzL3NxbC9ncm91cGluZ3NldHMuc3FsCkBAIC03NzEs NiArNzcxLDI2IEBAIGV4cGxhaW4gKGNvc3RzIG9mZikKIHNlbGVjdCAxIGFzIG9uZSBncm91cCBi eSByb2xsdXAob25lKSBvcmRlciBieSBvbmUgbnVsbHMgZmlyc3Q7CiBzZWxlY3QgMSBhcyBvbmUg Z3JvdXAgYnkgcm9sbHVwKG9uZSkgb3JkZXIgYnkgb25lIG51bGxzIGZpcnN0OwogCistLSBBIGdy b3VwaW5nIGV4cHJlc3Npb24gY29udGFpbmluZyBubyBWYXJzIG9mIHRoZSBxdWVyeSBsZXZlbCBy ZWZlcnMgb25seQorLS0gdG8gdGhlIHRhcmdldGxpc3QgZW50cnkgR1JPVVAgQlkgaWRlbnRpZmll ZDsgZXF1YWwgZXhwcmVzc2lvbnMgZWxzZXdoZXJlCistLSBtdXN0IG5vdCBiZSByZXBsYWNlZCBi eSBncm91cGVkIFZhcnMgKHRoaXMgdXNlZCB0byBjcmFzaCkKK3NlbGVjdCBhcnJheVtdOjp2YXJj aGFyKDUwMClbXSBhcyBhIGdyb3VwIGJ5IGNhc3QoJ3RydWUnIGFzIGJvb2xlYW4pOworc2VsZWN0 IGFycmF5W106OnZhcmNoYXIoNTAwKVtdIGFzIGEgZ3JvdXAgYnkgNTA0OjppbnQ0Oworc2VsZWN0 IChzZWxlY3QgYXJyYXlbXTo6dmFyY2hhcig1MDApW10pIGFzIGEKK2dyb3VwIGJ5IHJvbGx1cChj YXN0KCd0cnVlJyBhcyBib29sZWFuKSk7CisKK2V4cGxhaW4gKHZlcmJvc2UsIGNvc3RzIG9mZikK K3NlbGVjdCAxIGFzIGEsIDEgYXMgYiwgMSsyIGFzIGMsICgxKzIpKjEwIGFzIGQKK2dyb3VwIGJ5 IHJvbGx1cChhLCBjKTsKK3NlbGVjdCAxIGFzIGEsIDEgYXMgYiwgMSsyIGFzIGMsICgxKzIpKjEw IGFzIGQKK2dyb3VwIGJ5IHJvbGx1cChhLCBjKQorb3JkZXIgYnkgYSBudWxscyBmaXJzdCwgYyBu dWxscyBmaXJzdDsKKworLS0gbGlrZXdpc2UgZm9yIGFuIG91dGVyIHJlZmVyZW5jZSB1c2VkIGFz IGEgZ3JvdXBpbmcgZXhwcmVzc2lvbgorc2VsZWN0IGFycmF5KHNlbGVjdCBvLmEgYXMgayBmcm9t ICh2YWx1ZXMgKDEpKSBhcyBpICh4KQorICAgICAgICAgICAgIGdyb3VwIGJ5IHJvbGx1cChvLmEs IHgrMCkgb3JkZXIgYnkgMSBudWxscyBmaXJzdCkKK2Zyb20gKHZhbHVlcyAoMTApKSBhcyBvIChh KTsKKwogZXhwbGFpbiAoY29zdHMgb2ZmKQogc2VsZWN0IGEsIGIsIHJvd19udW1iZXIoKSBvdmVy IChvcmRlciBieSBhLCBiIG51bGxzIGZpcnN0KQogZnJvbSAodmFsdWVzICgxLCAxKSwgKDIsIDIp KSBhcyB0IChhLCBiKSB3aGVyZSBhID0gYgotLSAKMi41MC4xIChBcHBsZSBHaXQtMTU1KQoK --fab324f90f2891d1e3a5e28e9e44b331687c01e8f70295064c92edad371f--