mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

builtin.c: fix build with -Woverlength-strings

Browse Source 
C99 only allows string literals long at most 4095 characters.
jq_builtins was a lot longer than that.

I rewrote all the optional libm error stubs in C so the value of
jq_builtins is not build dependent.

I replaced the command that generates builtin.inc with a POSIX compliant
od|sed command that encodes builtin.jq as a comma delimited list of
octal numbers (that can be embedded in C using a {} literal).

I also added -Woverlength-strings to AM_CFLAGS to verify that the
problem is fixed.

Fixes #1481
This commit is contained in:
Emanuele Torre
2024-01-26 04:42:11 +01:00
committed by Nico Williams
parent 7bdc9a7a63
commit 605836b263
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -19,7 +19,8 @@ LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c \
### C build options
AM_CFLAGS = -Wextra -Wall -Wno-unused-parameter -Wno-unused-function
AM_CFLAGS = -Wextra -Wall -Wno-unused-parameter -Wno-unused-function \
-Woverlength-strings
if WIN32
AM_CFLAGS += -municode
@ -119,7 +120,12 @@ src/main.c: src/version.h src/config_opts.inc
src/builtin.inc: $(srcdir)/src/builtin.jq
mkdir -p src
$(AM_V_GEN) sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $(srcdir)/src/builtin.jq > $@
$(AM_V_GEN) od -v -A n -t o1 -- $< | \
sed -e 's/$$/ /' \
-e 's/\([0123456789]\) /\1, /g' \
-e 's/ $$//' \
-e 's/ 0/ 0/g' \
-e 's/ \([123456789]\)/ 0\1/g' > $@
src/builtin.o: src/builtin.inc
CLEANFILES = src/version.h .remake-version-h src/builtin.inc src/config_opts.inc

86
src/builtin.c
View File

@ -155,7 +155,11 @@ static jv f_ ## name(jq_state *jq, jv input) { \
jv_free(input); \
return ret; \
}
#define LIBM_DD_NO(name)
#define LIBM_DD_NO(name) \
static jv f_ ## name(jq_state *jq, jv input) { \
jv error = jv_string("Error: " #name "/0 not found at build time"); \
return ret_error(input, error); \
}
#define LIBM_DDD(name) \
static jv f_ ## name(jq_state *jq, jv input, jv a, jv b) { \
@ -173,7 +177,12 @@ static jv f_ ## name(jq_state *jq, jv input, jv a, jv b) { \
jv_free(b); \
return ret; \
}
#define LIBM_DDD_NO(name)
#define LIBM_DDD_NO(name) \
static jv f_ ## name(jq_state *jq, jv input, jv a, jv b) { \
jv_free(b); \
jv error = jv_string("Error: " #name "/2 not found at build time"); \
return ret_error2(input, a, error); \
}
#define LIBM_DDDD(name) \
static jv f_ ## name(jq_state *jq, jv input, jv a, jv b, jv c) { \
@ -199,7 +208,14 @@ static jv f_ ## name(jq_state *jq, jv input, jv a, jv b, jv c) { \
jv_free(c); \
return ret; \
}
#define LIBM_DDDD_NO(name)
#define LIBM_DDDD_NO(name) \
static jv f_ ## name(jq_state *jq, jv input, jv a, jv b, jv c) { \
jv_free(c) \
jv_free(b); \
jv error = jv_string("Error: " #name "/3 not found at build time"); \
return ret_error2(input, a, error); \
}
#include "libm.h"
#undef LIBM_DDDD_NO
#undef LIBM_DDD_NO
@ -226,6 +242,11 @@ static jv f_frexp(jq_state *jq, jv input) {
jv_free(input);
return ret;
}
#else
static jv f_frexp(jq_state *jq, jv input) {
jv error = jv_string("Error: frexp/0 not found at build time");
return ret_error(input, error);
}
#endif
#ifdef HAVE_MODF
static jv f_modf(jq_state *jq, jv input) {
@ -237,6 +258,11 @@ static jv f_modf(jq_state *jq, jv input) {
jv_free(input);
return jv_array_append(ret, jv_number(i));
}
#else
static jv f_modf(jq_state *jq, jv input) {
jv error = jv_string("Error: modf/0 not found at build time");
return ret_error(input, error);
}
#endif
#ifdef HAVE_LGAMMA_R
static jv f_lgamma_r(jq_state *jq, jv input) {
@ -248,6 +274,11 @@ static jv f_lgamma_r(jq_state *jq, jv input) {
jv_free(input);
return jv_array_append(ret, jv_number(sign));
}
#else
static jv f_lgamma_r(jq_state *jq, jv input) {
jv error = jv_string("Error: lgamma_r/0 not found at build time");
return ret_error(input, error);
}
#endif
static jv f_negate(jq_state *jq, jv input) {
@ -1672,27 +1703,21 @@ static jv f_current_line(jq_state *jq, jv a) {
#define LIBM_DD(name) \
{f_ ## name, #name, 1},
#define LIBM_DD_NO(name)
#define LIBM_DD_NO(name) LIBM_DD(name)
#define LIBM_DDD(name) \
{f_ ## name, #name, 3},
#define LIBM_DDD_NO(name)
#define LIBM_DDD_NO(name) LIBM_DDD(name)
#define LIBM_DDDD(name) \
{f_ ## name, #name, 4},
#define LIBM_DDDD_NO(name)
#define LIBM_DDDD_NO(name) LIBM_DDDD(name)
static const struct cfunction function_list[] = {
#include "libm.h"
#ifdef HAVE_FREXP
{f_frexp,"frexp", 1},
#endif
#ifdef HAVE_MODF
{f_modf,"modf", 1},
#endif
#ifdef HAVE_LGAMMA_R
{f_lgamma_r,"lgamma_r", 1},
#endif
{f_negate, "_negate", 1},
#define BINOP(name) {f_ ## name, "_" #name, 3},
BINOPS
@ -1805,42 +1830,11 @@ static block bind_bytecoded_builtins(block b) {
return BLOCK(builtins, b);
}
static const char jq_builtins[] =
static const char jq_builtins[] = {
/* Include jq-coded builtins */
#include "src/builtin.inc"
/* Include unsupported math functions next */
#define LIBM_DD(name)
#define LIBM_DDD(name)
#define LIBM_DDDD(name)
#define LIBM_DD_NO(name) "def " #name ": \"Error: " #name "/0 not found at build time\"|error;"
#define LIBM_DDD_NO(name) "def " #name "(a;b): \"Error: " #name "/2 not found at build time\"|error;"
#define LIBM_DDDD_NO(name) "def " #name "(a;b;c): \"Error: " #name "/3 not found at build time\"|error;"
#include "libm.h"
#ifndef HAVE_FREXP
"def frexp: \"Error: frexp/0 not found at build time\"|error;"
#endif
#ifndef HAVE_MODF
"def modf: \"Error: modf/0 not found at build time\"|error;"
#endif
#ifndef HAVE_LGAMMA_R
"def lgamma_r: \"Error: lgamma_r/0 not found at build time\"|error;"
#endif
;
#undef LIBM_DDDD_NO
#undef LIBM_DDD_NO
#undef LIBM_DD_NO
#undef LIBM_DDDD
#undef LIBM_DDD
#undef LIBM_DD
#ifdef __APPLE__
#undef HAVE_GAMMA
#undef HAVE_EXP10
#undef HAVE_DREM
#undef HAVE_SIGNIFICAND
#endif
'\0',
};
static block gen_builtin_list(block builtins) {
jv list = jv_array_append(block_list_funcs(builtins, 1), jv_string("builtins/0"));