Skip to content

Commit

Permalink
chore(asm): use byte pointer instead of c_char_p (#10428) (#10440)
Browse files Browse the repository at this point in the history
Backport of #10428

(cherry picked from commit
46bb2a8)

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
  • Loading branch information
christophe-papazian committed Aug 29, 2024
1 parent ba3a2bc commit 97d9eb8
Showing 1 changed file with 2 additions and 2 deletions.
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

0 comments on commit 97d9eb8

Please sign in to comment.