7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-24 05:14:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions4

fix CCArrayExt crashing on a nullptr array

Browse source
This commit is contained in:
HJfod 2022-10-26 16:20:39 +03:00
parent 9e4b236d1b
commit 2a81ed1ac1
2 changed files with 10 additions and 5 deletions
CMakeLists.txt
loader/include/Geode/utils
cocos.hpp

4
CMakeLists.txt
View file

@ -106,7 +106,7 @@ elseif(EXISTS ${GEODE_PLATFORM_BIN_PATH})
)
else()
message(FATAL_ERROR
"No valid loader binary to link to! Install prebuilts with `geode sdk install-prebuilts` "
"or build Geode from source."
"No valid loader binary to link to! Install prebuilts with `geode sdk install-prebuilts`, "
"or build Geode from source and add `set(GEODE_LINK_NIGHTLY On)` to your CMakeLists.txt."
)
endif()

11
loader/include/Geode/utils/cocos.hpp
View file

@ -317,15 +317,20 @@ namespace geode::cocos {
~CCArrayExt() {}
auto begin() {
if (!m_arr) {
return CCArrayIterator<T*>(nullptr);
}
return CCArrayIterator<T*>(reinterpret_cast<T**>(m_arr->data->arr));
}
auto end() {
if (!m_arr) {
return CCArrayIterator<T*>(nullptr);
}
return CCArrayIterator<T*>(reinterpret_cast<T**>(m_arr->data->arr) + m_arr->count());
}
auto size() const {
return m_arr->count();
size_t size() const {
return m_arr ? m_arr->count() : 0;
}
T operator[](size_t index) {