https://github.com/Kitware/CMake
Revision cb53d9309eb932e40fcdf3609eb050358ede2d17 authored by Brad King on 07 November 2022, 19:18:22 UTC, committed by Brad King on 07 November 2022, 19:24:24 UTC
When `cmStateSnapshot::RaiseScope` raises a variable in to a parent directory scope, it uses `GetBuildsystemDirectoryParent` to find the current top-most scope on the directory's stack. Since commit 3f4e5e8c3d (cmState: Return end snapshot for GetBuildsystemDirectoryParent., 2015-09-01, v3.4.0-rc1~100^2~1), that depends on the `DirectoryEnd` field in the directory's state. However, when variable-only scopes were added by commit 6954c8936f (cmState: Add a VariableScope snapshot type., 2015-08-01, v3.4.0-rc1~179^2~1), we neglected to account for the addition of that field by commit 52dbe654de (cmState: Record the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1). Prior to commit 44a2f3f332 (Add new flow-control commands for variables and policies scopes management, 2022-08-05, v3.25.0-rc1~257^2) this problem went unnoticed because there was no way to have a variable scope at the top of a directory's stack while processing a subdirectory. Now the `block()/endblock()` commands enable the behavior, so fix tracking of a variable scope as the top-most scope in a directory. Fixes: #24138
1 parent 7c52e9e
Tip revision: cb53d9309eb932e40fcdf3609eb050358ede2d17 authored by Brad King on 07 November 2022, 19:18:22 UTC
block: Fix variable scope protection from modification by subdirectories
block: Fix variable scope protection from modification by subdirectories
Tip revision: cb53d93
| File | Mode | Size |
|---|---|---|
| .gitattributes | -rw-r--r-- | 14 bytes |
| CMakeLists.txt | -rw-r--r-- | 601 bytes |
| Copyright.txt | -rw-r--r-- | 1.0 KB |
| README | -rw-r--r-- | 5.2 KB |
| adler32.c | -rw-r--r-- | 5.1 KB |
| cm_zlib_mangle.h | -rw-r--r-- | 6.0 KB |
| compress.c | -rw-r--r-- | 2.6 KB |
| crc32.c | -rw-r--r-- | 31.2 KB |
| crc32.h | -rw-r--r-- | 577.9 KB |
| deflate.c | -rw-r--r-- | 79.9 KB |
| deflate.h | -rw-r--r-- | 12.8 KB |
| gzclose.c | -rw-r--r-- | 678 bytes |
| gzguts.h | -rw-r--r-- | 6.7 KB |
| gzlib.c | -rw-r--r-- | 16.3 KB |
| gzread.c | -rw-r--r-- | 20.0 KB |
| gzwrite.c | -rw-r--r-- | 19.2 KB |
| inffast.c | -rw-r--r-- | 12.7 KB |
| inffast.h | -rw-r--r-- | 427 bytes |
| inffixed.h | -rw-r--r-- | 6.2 KB |
| inflate.c | -rw-r--r-- | 54.7 KB |
| inflate.h | -rw-r--r-- | 6.5 KB |
| inftrees.c | -rw-r--r-- | 12.7 KB |
| inftrees.h | -rw-r--r-- | 2.9 KB |
| trees.c | -rw-r--r-- | 41.9 KB |
| trees.h | -rw-r--r-- | 8.3 KB |
| uncompr.c | -rw-r--r-- | 2.9 KB |
| zconf.h | -rw-r--r-- | 15.9 KB |
| zlib.h | -rw-r--r-- | 96.0 KB |
| zutil.c | -rw-r--r-- | 7.2 KB |
| zutil.h | -rw-r--r-- | 7.3 KB |
Computing file changes ...
