Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simplify pickup.cpp #3

Closed
mlangsdorf opened this issue Jul 22, 2018 · 0 comments
Closed

simplify pickup.cpp #3

mlangsdorf opened this issue Jul 22, 2018 · 0 comments

Comments

@mlangsdorf
Copy link
Owner

picking stuff up from a cargo space should be a vpuse action, as should all other vehpart interactions, so hopefully the vehicle parts of pickup.cpp should just go away.
mlangsdorf pushed a commit that referenced this issue Jul 27, 2018
Merge pull request #3 from CleverRaven/master
906f28b 
Update master
mlangsdorf pushed a commit that referenced this issue Aug 5, 2018
@rtizzy
Merge pull request #3 from CleverRaven/master
f492732 
Pull from master
mlangsdorf pushed a commit that referenced this issue Sep 20, 2018
@Inglonias
Merge pull request #3 from CleverRaven/master
0f7aae7 
Bring up to date
mlangsdorf pushed a commit that referenced this issue Oct 7, 2018
@Theundyingcode
Merge pull request #3 from CleverRaven/master
32bca51 
merge upstream
mlangsdorf pushed a commit that referenced this issue Dec 17, 2018
@Inglonias
Merge pull request #3 from CleverRaven/master
098496f 
Bring me up to speed
mlangsdorf pushed a commit that referenced this issue Feb 16, 2019
@hyper2snyper
Merge pull request #3 from CleverRaven/master
1c57110 
2
mlangsdorf pushed a commit that referenced this issue Feb 19, 2019
@Mecares
Merge pull request #3 from CleverRaven/master
c3f7250 
Update
mlangsdorf pushed a commit that referenced this issue Apr 30, 2019
@ZhilkinSerg
Merge pull request CleverRaven#30054 from ifreund/lint-json-3
0c95a7e 
Lint json #3
mlangsdorf pushed a commit that referenced this issue May 31, 2019
@eilaattwood
Merge pull request #3 from CleverRaven/master
3363450 
Sync repository
mlangsdorf pushed a commit that referenced this issue Oct 26, 2019
Merge pull request #3 from CleverRaven/master
47fadfe 
Update #3
mlangsdorf pushed a commit that referenced this issue Apr 5, 2020
@8street
Merge pull request #3 from CleverRaven/master
5c83410 
Update forked repo
mlangsdorf pushed a commit that referenced this issue May 21, 2020
@BevapDin
Fix crash caused by accessing item of empty list.
fc4fb73 
The function `are_requirements_nearby` accesses `player::backlog::front()`, which causes UB when the `backlog` list is empty.

This is usually checked by the caller, but there is at least one way to reach this function without that check:

```
#2  0x000000000083dfaa in string_id<activity_type>::operator== (rhs=..., this=0xdf1b460) at src/player_activity.h:93
#3  are_requirements_nearby (loot_spots=std::vector of length 21, capacity 32 = {...}, needed_things=..., p=..., activity_to_restore=..., in_loot_zones=true, src_loc=...)
    at src/activity_item_handling.cpp:1113
#4  0x0000000000843a46 in generic_multi_activity_check_requirement (p=..., act_id=..., act_info=..., src=..., src_loc=...,
    src_set=std::unordered_set with 1 element = {...}, check_only=false) at src/activity_item_handling.cpp:2676
#5  0x0000000000852813 in generic_multi_activity_handler (act=..., p=..., check_only=check_only@entry=false) at src/activity_item_handling.cpp:2885
#6  0x0000000000800896 in activity_handlers::multiple_butcher_do_turn (act=<optimized out>, p=<optimized out>) at src/activity_handlers.cpp:3822
#7  0x000000000082b248 in std::_Function_handler<void (player_activity*, player*), void (*)(player_activity*, player*)>::_M_invoke(std::_Any_data const&, player_activity*&&, player*&&) (__functor=..., __args#0=<optimized out>, __args#1=<optimized out>) at /usr/include/c++/8/bits/std_function.h:88
#8  0x00000000008630e3 in std::function<void (player_activity*, player*)>::operator()(player_activity*, player*) const (this=<optimized out>, __args#0=<optimized out>,
    __args#0@entry=0xdf1b330, __args#1=<optimized out>, __args#1@entry=0xdf1ae50) at /usr/include/c++/8/bits/std_function.h:260
#9  0x0000000000860306 in activity_type::call_do_turn (this=0x2c3c930, act=act@entry=0xdf1b330, p=p@entry=0xdf1ae50) at src/activity_type.cpp:118
#10 0x00000000014a968b in player_activity::do_turn (this=this@entry=0xdf1b330, p=...) at src/player_activity.cpp:237
#11 0x00000000013092a4 in npc::do_player_activity (this=this@entry=0xdf1ae50) at src/npcmove.cpp:3299
#12 0x0000000001322a07 in npc::execute_action (this=this@entry=0xdf1ae50, action=<optimized out>, action@entry=npc_player_activity) at src/npcmove.cpp:1237
#13 0x000000000132690a in npc::move (this=this@entry=0xdf1ae50) at src/npcmove.cpp:907
```

This adds a simple check within the function.
mlangsdorf pushed a commit that referenced this issue May 21, 2020
@BeastFolks
Merge pull request #3 from AlisW02/patch-4
4b7213c 
updated descriptions
mlangsdorf pushed a commit that referenced this issue Jun 1, 2020
@faefux
Merge pull request #3 from CleverRaven/master
4ce8939 
merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@mlangsdorf