avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix pointer truncation for Windows x64

This commit is contained in:
Marius Greuel 2022-10-08 19:02:03 +02:00
parent 44fe5bec2d
commit 9377acee0e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/term.c
View File

@ -23,6 +23,7 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
@ -1147,7 +1148,7 @@ static int cmd_quell(PROGRAMMER * pgm, struct avrpart * p,
static int tokenize(char * s, char *** argv) static int tokenize(char * s, char *** argv)
{ {
int i, n, l, k, nargs, offset; int i, n, l, nargs;
int len, slen; int len, slen;
char * buf; char * buf;
int bufsize; int bufsize;
@ -1208,7 +1209,7 @@ static int tokenize(char * s, char *** argv)
bufv = bufv_tmp; bufv = bufv_tmp;
nbuf = &buf[l]; nbuf = &buf[l];
/* correct bufv pointers */ /* correct bufv pointers */
k = buf - bufp; ptrdiff_t k = buf - bufp;
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
bufv[i] = bufv[i] + k; bufv[i] = bufv[i] + k;
} }
@ -1229,7 +1230,7 @@ static int tokenize(char * s, char *** argv)
q = (char *)&av[n+1]; q = (char *)&av[n+1];
memcpy(q, buf, l); memcpy(q, buf, l);
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
offset = bufv[i] - buf; ptrdiff_t offset = bufv[i] - buf;
av[i] = q + offset; av[i] = q + offset;
} }
av[i] = NULL; av[i] = NULL;