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.

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

chore(asm): use byte pointer instead of c_char_p (#10428) #10441

Merged
merged 1 commit into from
Sep 9, 2024
Merged
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
4 changes: 2 additions & 2 deletions ddtrace/appsec/_ddwaf/ddwaf_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def create_without_limits(cls, struct: DDWafRulesType) -> "ddwaf_object":
def struct(self) -> DDWafRulesType:
"""Generate a python structure from ddwaf_object"""
if self.type == DDWAF_OBJ_TYPE.DDWAF_OBJ_STRING:
return self.value.stringValue.decode("UTF-8", errors="ignore")
return self.value.stringValue[: self.nbEntries].decode("UTF-8", errors="ignore")
if self.type == DDWAF_OBJ_TYPE.DDWAF_OBJ_MAP:
return {
self.value.array[i].parameterName.decode("UTF-8", errors="ignore"): self.value.array[i].struct
Expand Down Expand Up @@ -211,7 +211,7 @@ def __repr__(self):

class ddwaf_value(ctypes.Union):
_fields_ = [
("stringValue", ctypes.c_char_p),
("stringValue", ctypes.POINTER(ctypes.c_char)),
("uintValue", ctypes.c_ulonglong),
("intValue", ctypes.c_longlong),
("array", ddwaf_object_p),
Expand Down
Loading