Attempt to fix merge conflicts #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
I have no idea whats going on here. There is NO feral range guns anymore if i look at the current mainline cdda code, but here it says i remove feral guns. Im reading this wrong
github-actions
bot
added
[Markdown]
Game: Achievements / Conducts / Scores
[Python]
<Documentation>
Code: Tooling
Code: Tests
Crafting / Construction / Recipes
EOC: Effects On Condition
Fields / Furniture / Terrain / Traps
Items: Food / Vitamins
NPC / Factions
Melee
Info / User Interface
Items: Archery
Monsters
Mutations / Traits / Professions/ Hobbies
Spawn
Map / Mapgen
Items: Ammo / Guns
Translation
Mods: Aftershock
Mods: Generic Guns
Mods: Magiclysm
Mods: Xedra Evolved
Mechanics: Enchantments / Spells
Vehicles
labels
b3brodie
pushed a commit
that referenced
this pull request
Dec 21, 2024
b3brodie
pushed a commit
that referenced
this pull request
Jan 13, 2025
Prevents segfault when searches during character creation gives no hits. To reproduce the issue being fixed: 1. Create custom character 2. Tab to "Scenario" 3. Press `/` to search, enter something that gives no hits, such as `99` 4. Segfault Similar segfault also happens for "Profession" and "Background" tab. Stacktrace of segfault being fixed: ``` Thread 1 "cataclysm-tiles" received signal SIGABRT, Aborted. __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44 warning: 44 ./nptl/pthread_kill.c: No such file or directory (gdb) bt #0 __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44 #1 0x00007ffff778acef in __pthread_kill_internal (threadid=<optimized out>, signo=6) at ./nptl/pthread_kill.c:78 #2 0x00007ffff7736c42 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26 CleverRaven#3 0x00007ffff771f4f0 in __GI_abort () at ./stdlib/abort.c:79 CleverRaven#4 0x00007ffff7ad4f9e in std::__glibcxx_assert_fail(char const*, int, char const*, char const*) () from /lib/x86_64-linux-gnu/libstdc++.so.6 CleverRaven#5 0x0000555556536759 in std::vector<string_id<profession>, std::allocator<string_id<profession> > >::operator[] (this=<optimized out>, __n=<optimized out>) at /usr/include/c++/14/bits/stl_vector.h:1130 CleverRaven#6 std::vector<string_id<profession>, std::allocator<string_id<profession> > >::operator[] (this=<optimized out>, __n=<optimized out>) at /usr/include/c++/14/bits/stl_vector.h:1128 CleverRaven#7 0x000055555653609b in operator() (__closure=0x555558499bd0, ui=...) at src/newcharacter.cpp:2544 CleverRaven#8 0x00005555569d5a09 in ui_adaptor::redraw_invalidated () at src/ui_manager.cpp:448 CleverRaven#9 0x00005555569d5ac7 in ui_adaptor::redraw () at src/ui_manager.cpp:353 CleverRaven#10 0x00005555569d5aee in ui_manager::redraw () at src/ui_manager.cpp:516 CleverRaven#11 0x00005555567242cd in query_popup::query_once (this=this@entry=0x7fffffff6890) at src/popup.cpp:295 CleverRaven#12 0x0000555556724b9f in query_popup::query (this=this@entry=0x7fffffff6890) at src/popup.cpp:405 CleverRaven#13 0x000055555664b8ff in popup (text="Nothing found.", flags=flags@entry=PF_NONE) at src/output.cpp:993 CleverRaven#14 0x0000555555aadb73 in popup<>(char const*) (mes=mes@entry=0x555556b4cd0a "Nothing found.") at src/output.h:529 CleverRaven#15 0x0000555556529731 in filter_entries<string_id<profession>, <unnamed struct> >(avatar &, int &, std::vector<string_id<profession>, std::allocator<string_id<profession> > > &, std::vector<string_id<profession>, std::allocator<string_id<profession> > > &, std::string, struct {...}, string_id<profession>) (u=..., cur_id=@0x7fffffff6ba4: 0, old_entries=std::vector of length 0, capacity 185, new_entries=std::vector of length 185, capacity 185 = {...}, filterstring="999", sorter=..., chosen_entry=...) at src/newcharacter.cpp:2415 CleverRaven#16 0x0000555556531f9b in set_profession (tabs=..., u=..., pool=<optimized out>) at src/newcharacter.cpp:2598 CleverRaven#17 avatar::create (this=this@entry=0x5555583e4150, type=type@entry=character_type::CUSTOM, tempname="") at src/newcharacter.cpp:837 CleverRaven#18 0x0000555556242bc0 in main_menu::new_character_tab (this=this@entry=0x7fffffffd9f0) at src/main_menu.cpp:1028 CleverRaven#19 0x0000555556245326 in main_menu::opening_screen (this=this@entry=0x7fffffffd9f0) at src/main_menu.cpp:884 CleverRaven#20 0x00005555557feb01 in main (argc=<optimized out>, argv=<optimized out>) at src/main.cpp:857 (gdb) frame 7 CleverRaven#7 0x000055555653609b in operator() (__closure=0x55557a911460, ui=...) at src/newcharacter.cpp:2544 2544 if( u.prof != &sorted_profs[i].obj() ) { (gdb) print i $1 = 0 (gdb) print sorted_profs $2 = std::vector of length 0, capacity 185 (gdb) print iStartPos $3 = (int &) @0x7fffffff6bc0: 0 (gdb) print end_pos $4 = 59 (gdb) print profs_length $5 = (size_t &) @0x7fffffff6c08: 185 (gdb) print iContentHeight $6 = (size_t &) @0x7fffffff6be0: 59 ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
just for my repository so this shouldn't need anything ideally