Fix MAX_DATA_SIZE, in case 16 symbols are needed by structured appending

lemniscati · lemniscati · commit ec7f4af21710 · 2021-08-03T22:06:15.000+09:00
Fix a bug introduced in the commit 3e629c7
diff --git a/qrenc.c b/qrenc.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "qrencode.h"
+#include "qrinput.h"
 
 #define INCHES_PER_METER (100.0/2.54)
 
@@ -237,7 +238,7 @@ static int color_set(unsigned char color[4], const char *value)
 	return 0;
 }
 
-#define MAX_DATA_SIZE (7090 * 2) /* timed by the safty factor 2 */
+#define MAX_DATA_SIZE (7089 * MAX_STRUCTURED_SYMBOLS + 1) /* an upper bound (cf. the specification) */
 static unsigned char data_buffer[MAX_DATA_SIZE];
 static unsigned char *readFile(FILE *fp, int *length)
 {

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`#endif`
`33`	`33`
`34`	`34`	`#include "qrencode.h"`
	`35`	`+#include "qrinput.h"`
`35`	`36`
`36`	`37`	`#define INCHES_PER_METER (100.0/2.54)`
`37`	`38`
`@@ -237,7 +238,7 @@ static int color_set(unsigned char color[4], const char *value)`
`237`	`238`	`return 0;`
`238`	`239`	`}`
`239`	`240`
`240`		`-#define MAX_DATA_SIZE (7090 * 2) /* timed by the safty factor 2 */`
	`241`	`+#define MAX_DATA_SIZE (7089 * MAX_STRUCTURED_SYMBOLS + 1) /* an upper bound (cf. the specification) */`
`241`	`242`	`static unsigned char data_buffer[MAX_DATA_SIZE];`
`242`	`243`	`static unsigned char readFile(FILE fp, int *length)`
`243`	`244`	`{`