security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpgscm: Build well even if NDEBUG defined.

Browse Source 
* gpgscm/scheme.c (gc_reservation_failure): Fix adding ";".
[!NDEBUG] (scheme_init_custom_alloc): Don't init seserved_lineno.

--

Picked from libgpg-error commit of:
	8a9397896fd202dcfb3fb46259e43bc05a0ddd2e

In some build environment, NDEBUG is defined (although it's
bad practice).  This change supports such a situation.

GnuPG-bug-id: 3959
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-02-25 10:44:16 +09:00
parent 611faf1579
commit e140c6d4f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/gpgscm/scheme.c
View File

@ -872,7 +872,7 @@ gc_reservation_failure(struct scheme *sc)
{ {
#ifdef NDEBUG #ifdef NDEBUG
fprintf(stderr, fprintf(stderr,
"insufficient reservation\n") "insufficient reservation\n");
#else #else
fprintf(stderr, fprintf(stderr,
"insufficient %s reservation in line %d\n", "insufficient %s reservation in line %d\n",
@ -5614,7 +5614,9 @@ int scheme_init_custom_alloc(scheme *sc, func_alloc malloc, func_dealloc free) {
sc->fcells = 0; sc->fcells = 0;
sc->inhibit_gc = GC_ENABLED; sc->inhibit_gc = GC_ENABLED;
sc->reserved_cells = 0; sc->reserved_cells = 0;
#ifndef NDEBUG
sc->reserved_lineno = 0; sc->reserved_lineno = 0;
#endif
sc->no_memory=0; sc->no_memory=0;
sc->inport=sc->NIL; sc->inport=sc->NIL;
sc->outport=sc->NIL; sc->outport=sc->NIL;