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

Prevent item::charges_per_weight to return overflowed values #79422

Merged
merged 9 commits into from
Jan 31, 2025
Merged

Prevent item::charges_per_weight to return overflowed values #79422

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21a44d3
fix aim query amount showing wrong amount
marilynias Jan 29, 2025
334e395
Prevent overflowing from charges_per_weight() and charges_per_volume()
marilynias Jan 30, 2025
cfda3b5
Update src/advanced_inv.cpp
marilynias Jan 30, 2025
deee076
Update src/item.cpp
marilynias Jan 30, 2025
ed95b17
Update src/item.cpp
marilynias Jan 30, 2025
5358a65
Update src/item.cpp
marilynias Jan 30, 2025
385a707
Merge branch 'master' of https://github.com/marilynias/Cataclysm-DDA …
marilynias Jan 30, 2025
7c827c4
Merge branch 'fix-aim-weight' of https://github.com/marilynias/Catacl…
marilynias Jan 30, 2025
29cb28e
retest
marilynias Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions src/item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,6 +1359,7 @@ void item::update_modified_pockets()

int item::charges_per_volume( const units::volume &vol, bool suppress_warning ) const
{
int64_t ret;
if( count_by_charges() ) {
if( type->volume == 0_ml ) {
if( !suppress_warning ) {
Expand All @@ -1368,7 +1369,7 @@ int item::charges_per_volume( const units::volume &vol, bool suppress_warning )
}
// Type cast to prevent integer overflow with large volume containers like the cargo
// dimension
return vol * static_cast<int64_t>( type->stack_size ) / type->volume;
ret = vol * static_cast<int64_t>( type->stack_size ) / type->volume;
} else {
units::volume my_volume = volume();
if( my_volume == 0_ml ) {
Expand All @@ -1377,30 +1378,24 @@ int item::charges_per_volume( const units::volume &vol, bool suppress_warning )
}
return INFINITE_CHARGES;
}
return vol / my_volume;
ret = vol / my_volume;
}
return std::min( ret, static_cast<int64_t>( INFINITE_CHARGES ) );
}

int item::charges_per_weight( const units::mass &m, bool suppress_warning ) const
{
if( count_by_charges() ) {
if( type->weight == 0_gram ) {
if( !suppress_warning ) {
debugmsg( "Item '%s' with zero weight", tname() );
}
return INFINITE_CHARGES;
int64_t ret;
units::mass my_weight = count_by_charges() ? type->weight : weight();
if( my_weight == 0_gram ) {
if( !suppress_warning ) {
debugmsg( "Item '%s' with zero weight", tname() );
}
return m / type->weight;
ret = INFINITE_CHARGES;
} else {
units::mass my_weight = weight();
if( my_weight == 0_gram ) {
if( !suppress_warning ) {
debugmsg( "Item '%s' with zero weight", tname() );
}
return INFINITE_CHARGES;
}
return m / my_weight;
ret = m / my_weight;
}
return std::min( ret, static_cast<int64_t>( INFINITE_CHARGES ) );
}

bool item::display_stacked_with( const item &rhs, bool check_components ) const
Expand Down
Loading