Skip to content

codeql/cpp-wrong-type-format-argument #173

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

Merged
merged 2 commits into from
Jan 25, 2025
Merged

codeql/cpp-wrong-type-format-argument #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55a2fb4
fixes codeql wrong-type-format-argument
michaeldsmith Jan 25, 2025
81d3166
Merge branch 'ampas:master' into codeql/cpp-wrong-type-format-argument
michaeldsmith Jan 25, 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
6 changes: 3 additions & 3 deletions lib/IlmCtl/CtlType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ void Type::childElementV(size_t *offset, TypePtr *type, const std::string path,
offsets=((SizeVector *)va_arg(ap, SizeVector *));
while(offsets->size()!=0) {
if(sizes.size()==0) {
throw(DatatypeExc("too many dimensions specified for matrix (or array) vector element (at least %d too many)", offsets->size()));
throw(DatatypeExc("too many dimensions specified for matrix (or array) vector element (at least %zu too many)", offsets->size()));
}
if(offset[0]>=sizes[0]) {
throw(DatatypeExc("out of range matrix (or array) vector element (%u>=%u)", offset[0], sizes[0]));
throw(DatatypeExc("out of range matrix (or array) vector element (%zu>=%zu)", offset[0], sizes[0]));
}
*offset=*offset+array_type->elementType()->objectSize()*((*offsets)[0]);
*type=array_type->elementType();
Expand All @@ -150,7 +150,7 @@ void Type::childElementV(size_t *offset, TypePtr *type, const std::string path,
}

if(u>=sizes[0]) {
throw(DatatypeExc("out of range matrix (or array) element specification (%u>=%u)", u, sizes[0]));
throw(DatatypeExc("out of range matrix (or array) element specification (%u>=%zu)", u, sizes[0]));
}

*offset=*offset+u*array_type->elementType()->objectSize();
Expand Down
4 changes: 2 additions & 2 deletions lib/IlmCtl/CtlTypeStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ void TypeStorage::_set(const char *src, CDataType_e src_type,
out=out+type()->objectSize();
}
} else {
throw(DatatypeExc("unexpected data objectSize (%d)", data_type->objectSize()));
throw(DatatypeExc("unexpected data objectSize (%zu)", data_type->objectSize()));
}
return;
}
Expand Down Expand Up @@ -547,7 +547,7 @@ void TypeStorage::_get(char *dst, CDataType_e dst_type,
in=in+type()->objectSize();
}
} else {
throw(DatatypeExc("unexpected data objectSize (%d)", data_type->objectSize()));
throw(DatatypeExc("unexpected data objectSize (%zu)", data_type->objectSize()));
}
return;
}
Expand Down
Loading