7x31
/
shellcheck
mirror of https://github.com/koalaman/shellcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2765 from josephcsible/bracedstring 

Get rid of a dangerous partial function from checkSpacefulnessCfg'
This commit is contained in:
Vidar Holen 2023-06-04 15:22:23 -07:00 committed by GitHub
parent 824c802b63 f03c437e2f
commit 4ffa9cc397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ShellCheck/Analytics.hs
View File

@ -2134,7 +2134,8 @@ checkSpacefulnessCfg' dirtyPass params token@(T_DollarBraced id _ list) =
addDoubleQuotesAround params token addDoubleQuotesAround params token
where where
name = getBracedReference $ concat $ oversimplify list bracedString = concat $ oversimplify list
name = getBracedReference bracedString
parents = parentMap params parents = parentMap params
needsQuoting = needsQuoting =
not (isArrayExpansion token) -- There's another warning for this not (isArrayExpansion token) -- There's another warning for this
@ -2153,14 +2154,10 @@ checkSpacefulnessCfg' dirtyPass params token@(T_DollarBraced id _ list) =
|| CF.spaceStatus (CF.variableValue state) == CF.SpaceStatusClean || CF.spaceStatus (CF.variableValue state) == CF.SpaceStatusClean
isDefaultAssignment parents token = isDefaultAssignment parents token =
let modifier = getBracedModifier $ bracedString token in let modifier = getBracedModifier bracedString in
any (`isPrefixOf` modifier) ["=", ":="] any (`isPrefixOf` modifier) ["=", ":="]
&& isParamTo parents ":" token && isParamTo parents ":" token
-- Given a T_DollarBraced, return a simplified version of the string contents.
bracedString (T_DollarBraced _ _ l) = concat $ oversimplify l
bracedString _ = error $ pleaseReport "bracedString on non-variable"
checkSpacefulnessCfg' _ _ _ = return () checkSpacefulnessCfg' _ _ _ = return ()