From 506043e2e4ddd02809427cced19b611d15c1bfd0 Mon Sep 17 00:00:00 2001
From: ryne3366 <zengchuanrui@huawei.com>
Date: Wed, 13 Aug 2025 16:27:44 +0800
Subject: [PATCH]  Fix CVE-2025-7458

 Signed-off-by: ryne3366 <zengchuanrui@huawei.com>
---
 src/sqlite3.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sqlite3.c b/src/sqlite3.c
index 71cad45..c9fc0bf 100644
--- a/src/sqlite3.c
+++ b/src/sqlite3.c
@@ -161689,6 +161689,10 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
       if( pFrom->isOrdered==pWInfo->pOrderBy->nExpr ){
         pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
       }
+      if( pWInfo->pSelect->pOrderBy
+       && pWInfo->nOBSat > pWInfo->pSelect->pOrderBy->nExpr ){
+        pWInfo->nOBSat = pWInfo->pSelect->pOrderBy->nExpr;
+      }
     }else{
       pWInfo->revMask = pFrom->revLoop;
       if( pWInfo->nOBSat<=0 ){
-- 
Gitee