Fossil SCM
Fix string comparison between tainted and untainted strings in TH1. [forum:/forumpost/6ab1c36a80|Forum post 6ab1c36a80].
Commit
45f3a45f3d3e1c77949603da1f05292e398aee89938fcbbc31224cac6fe6e5ca
Parent
57276a518ad6449…
1 file changed
+2
M
src/th.c
+2
| --- src/th.c | ||
| +++ src/th.c | ||
| @@ -2131,16 +2131,18 @@ | ||
| 2131 | 2131 | /* Evaluate left and right arguments, if they exist. */ |
| 2132 | 2132 | if( pExpr->pLeft ){ |
| 2133 | 2133 | rc = exprEval(interp, pExpr->pLeft); |
| 2134 | 2134 | if( rc==TH_OK ){ |
| 2135 | 2135 | zLeft = Th_TakeResult(interp, &nLeft); |
| 2136 | + nLeft = TH1_LEN(nLeft); | |
| 2136 | 2137 | } |
| 2137 | 2138 | } |
| 2138 | 2139 | if( rc==TH_OK && pExpr->pRight ){ |
| 2139 | 2140 | rc = exprEval(interp, pExpr->pRight); |
| 2140 | 2141 | if( rc==TH_OK ){ |
| 2141 | 2142 | zRight = Th_TakeResult(interp, &nRight); |
| 2143 | + nRight = TH1_LEN(nRight); | |
| 2142 | 2144 | } |
| 2143 | 2145 | } |
| 2144 | 2146 | |
| 2145 | 2147 | /* Convert arguments to their required forms. */ |
| 2146 | 2148 | if( rc==TH_OK ){ |
| 2147 | 2149 |
| --- src/th.c | |
| +++ src/th.c | |
| @@ -2131,16 +2131,18 @@ | |
| 2131 | /* Evaluate left and right arguments, if they exist. */ |
| 2132 | if( pExpr->pLeft ){ |
| 2133 | rc = exprEval(interp, pExpr->pLeft); |
| 2134 | if( rc==TH_OK ){ |
| 2135 | zLeft = Th_TakeResult(interp, &nLeft); |
| 2136 | } |
| 2137 | } |
| 2138 | if( rc==TH_OK && pExpr->pRight ){ |
| 2139 | rc = exprEval(interp, pExpr->pRight); |
| 2140 | if( rc==TH_OK ){ |
| 2141 | zRight = Th_TakeResult(interp, &nRight); |
| 2142 | } |
| 2143 | } |
| 2144 | |
| 2145 | /* Convert arguments to their required forms. */ |
| 2146 | if( rc==TH_OK ){ |
| 2147 |
| --- src/th.c | |
| +++ src/th.c | |
| @@ -2131,16 +2131,18 @@ | |
| 2131 | /* Evaluate left and right arguments, if they exist. */ |
| 2132 | if( pExpr->pLeft ){ |
| 2133 | rc = exprEval(interp, pExpr->pLeft); |
| 2134 | if( rc==TH_OK ){ |
| 2135 | zLeft = Th_TakeResult(interp, &nLeft); |
| 2136 | nLeft = TH1_LEN(nLeft); |
| 2137 | } |
| 2138 | } |
| 2139 | if( rc==TH_OK && pExpr->pRight ){ |
| 2140 | rc = exprEval(interp, pExpr->pRight); |
| 2141 | if( rc==TH_OK ){ |
| 2142 | zRight = Th_TakeResult(interp, &nRight); |
| 2143 | nRight = TH1_LEN(nRight); |
| 2144 | } |
| 2145 | } |
| 2146 | |
| 2147 | /* Convert arguments to their required forms. */ |
| 2148 | if( rc==TH_OK ){ |
| 2149 |