Skip to content

Merge upstream changes#2

Open
whitebelyash wants to merge 26 commits into
MojoLauncher:mainfrom
whitebelyash:upstream
Open

Merge upstream changes#2
whitebelyash wants to merge 26 commits into
MojoLauncher:mainfrom
whitebelyash:upstream

Conversation

@whitebelyash

Copy link
Copy Markdown

No description provided.

dneto0 and others added 26 commits April 13, 2026 03:34
SPIRV-Tools v2026.2.rc1
Glslang latest
SPIRV-Headers latest
Google-internal bug 393437270
Google internal bug 506281797
re2: 2025-11-08.bcr.1
matching abseil_cpp

latest SPIRV-Tools, Glslang, SPIRV-Headers

Abseil should link the MSVC runtime statically, unless building shared libs
Bug: crbug.com/3046665
Those files are generated during the ndk-build test
The HLSL front end in Glslang is deprecated and will
eventually be removed.
KhronosGroup/glslang#4210

Add CMake configuration option SHADERC_ENABLE_HLSL,
defaulting to ON.  In the future the default will
switch to OFF.

Adjust unit tests and glslc end-to-end tests.

Issue: google#1556
Refactor so it shares common scripts with the ndk-build flow.

bonk this
Also in kokoro scripts:
- ndk-build expects 0 or non-zero for SHADERC_ENABLE_HLSL
- fix executable perm on ndk-build-nohlsl/build.sh
Previously, preprocessor definition ENABLE_HLSL was always
created.

Now, define it only when CMake build option SHADERC_ENABLE_HLSL is on.
`gcc-17` cleaned up transitive header inclusion and exposed missing
header as a build failure:

```
In file included from /build/source/libshaderc_util/src/io_shaderc.cc:15:
/build/source/libshaderc_util/include/libshaderc_util/io_shaderc.h:54:31: error: 'std::ofstream' has not been declared
   54 |                               std::ofstream* file_stream, std::ostream* err);
      |                               ^~~
```
Add a null check for the return value of GetOutputStream() in
dependency_info.cc before dereferencing the stream pointer. When
GetOutputStream() fails to open the output file (e.g., due to
permission errors, full disk, or non-existent directory), it returns
nullptr. The code previously unconditionally dereferenced this pointer,
causing a segmentation fault (SIGSEGV).

This is the same vulnerability pattern that was fixed in
file_compiler.cc (commit 1d97901), but was missed in the
dependency_info.cc code path. The fix follows the identical pattern:
check the pointer for null before use and return false on failure.

Bug: Null pointer dereference when glslc is invoked with -MD flag
and the dependency info output file cannot be opened for writing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants