Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

asterisk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

aa10d6d5

Commit aa10d6d5 authored 6 years ago by George Joseph Committed by Gerrit Code Review 6 years ago

Downloads
- Plain Diff

Merge "jansson: Backport fixes to bundled, use json_vsprintf if available."

parents 9ae1bc4e adf539b2

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

configure 3 additions, 0 deletions

configure
include/asterisk/autoconfig.h.in 3 additions, 0 deletions

include/asterisk/autoconfig.h.in
main/json.c 10 additions, 1 deletion

main/json.c
third-party/jansson/configure.m4 1 addition, 0 deletions

third-party/jansson/configure.m4
third-party/jansson/patches/0022-Avoid-invalid-memory-read-in-json_pack.patch 38 additions, 0 deletions

...patches/0022-Avoid-invalid-memory-read-in-json_pack.patch
third-party/jansson/patches/0025-Call-va_end-after-va_copy-in-json_vsprintf.patch 64 additions, 0 deletions

...hes/0025-Call-va_end-after-va_copy-in-json_vsprintf.patch
third-party/jansson/patches/0027-Rename-a-varialble-that-shadows-another-one.patch 56 additions, 0 deletions

...es/0027-Rename-a-varialble-that-shadows-another-one.patch

with 175 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment