Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions python/debuginfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ def __getitem__(cls, value: str) -> 'DebugInfoParser':
parser = core.BNGetDebugInfoParserByName(str(value))
if parser is None:
raise KeyError(f"'{str(value)}' is not a valid debug-info parser")
parser_ref = core.BNNewDebugInfoParserReference(parser)
assert parser_ref is not None, "core.BNNewDebugInfoParserReference returned None"
return DebugInfoParser(parser_ref)
return DebugInfoParser(parser)

def __contains__(cls: '_DebugInfoParserMetaClass', name: object) -> bool:
if not isinstance(name, str):
Expand Down Expand Up @@ -162,9 +160,7 @@ def register(
_debug_info_parsers[len(_debug_info_parsers)] = (is_valid_cb, parse_info_cb)
parser = core.BNRegisterDebugInfoParser(name, is_valid_cb, parse_info_cb, None)
assert parser is not None, "core.BNRegisterDebugInfoParser is not None"
parser_ref = core.BNNewDebugInfoParserReference(parser)
assert parser_ref is not None, "core.BNNewDebugInfoParserReference returned None"
return DebugInfoParser(parser_ref)
return DebugInfoParser(parser)


class DebugInfoParser(object, metaclass=_DebugInfoParserMetaClass):
Expand Down
4 changes: 1 addition & 3 deletions python/typecontainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,9 @@ def parse_type_string(
_types.QualifiedName._from_core_struct(result_cpp.name),
_types.Type.create(handle=core.BNNewTypeReference(result_cpp.type))
)
core.BNFreeQualifiedNameAndType(result_cpp)
else:
result = None
core.BNFreeTypeParserResult(result_cpp)
core.BNFreeQualifiedNameAndType(result_cpp)

errors = []
for i in range(error_count.value):
Expand Down Expand Up @@ -427,4 +426,3 @@ def parse_types_from_source(self, source: str, file_name: str,

return result, errors


2 changes: 1 addition & 1 deletion python/typeparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,9 @@ def parse_type_string(
types.QualifiedName._from_core_struct(result_cpp.name),
types.Type.create(handle=core.BNNewTypeReference(result_cpp.type))
)
core.BNFreeQualifiedNameAndType(result_cpp)
else:
result = None
core.BNFreeQualifiedNameAndType(result_cpp)

errors = []
for i in range(error_count.value):
Expand Down
2 changes: 1 addition & 1 deletion python/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ def register_activity(self, activity: Activity, subactivities: List[ActivityType
handle = core.BNWorkflowRegisterActivity(self.handle, activity.handle, input_list, len(subactivities))
if handle is None:
return None
return activity
return Activity(handle=handle)

def contains(self, activity: ActivityType) -> bool:
"""
Expand Down
1 change: 1 addition & 0 deletions rust/src/types/container.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ impl TypeContainer {
if success {
Ok(QualifiedNameAndType::from_owned_raw(result))
} else {
unsafe { BNFreeQualifiedNameAndType(&mut result) };
assert!(!errors.is_null());
Err(unsafe { Array::new(errors, error_count, ()) })
}
Expand Down
1 change: 1 addition & 0 deletions rust/src/types/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ impl TypeParser for CoreTypeParser {
if result {
Ok(QualifiedNameAndType::from_owned_raw(output))
} else {
unsafe { BNFreeQualifiedNameAndType(&mut output) };
let errors: Array<TypeParserError> = unsafe { Array::new(errors, error_count, ()) };
Err(errors.to_vec())
}
Expand Down
1 change: 1 addition & 0 deletions typeparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ bool CoreTypeParser::ParseTypeString(const std::string& source, Ref<Platform> pl

if (!success)
{
BNFreeQualifiedNameAndType(&apiResult);
return false;
}

Expand Down
Loading