Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2025-02-06 08:30:02 +00:00
Code Issues Projects Releases Wiki Activity

EMAIL: Fortified get_line() code.

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-09-13 16:30:10 -04:00
parent 67126c6cd9
commit 1f5f193657
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/email.c
View File

@ -22,6 +22,7 @@
// Program constants // Program constants
#define MSGS_PER_PAGE 19 // Number of messages shown on summary screen #define MSGS_PER_PAGE 19 // Number of messages shown on summary screen
#define PROMPT_ROW 24 // Row that data entry prompt appears on #define PROMPT_ROW 24 // Row that data entry prompt appears on
#define LINEBUFSZ 1000 // According to RFC2822 Section 2.1.1 (998+CRLF)
#define READSZ 1024 // Size of buffer for copying files #define READSZ 1024 // Size of buffer for copying files
// Characters // Characters
@ -60,7 +61,7 @@ struct datetime {
char filename[80]; char filename[80];
char userentry[80]; char userentry[80];
char linebuf[998+2]; // According to RFC2822 Section 2.1.1 (998+CRLF) char linebuf[LINEBUFSZ];
char halfscreen[0x0400]; char halfscreen[0x0400];
FILE *fp; FILE *fp;
struct emailhdrs *headers; struct emailhdrs *headers;
@ -565,9 +566,10 @@ void update_highlighted(void) {
* fp - file to read from * fp - file to read from
* reset - if 1 then just reset the buffer and return * reset - if 1 then just reset the buffer and return
* writep - Pointer to buffer into which line will be written * writep - Pointer to buffer into which line will be written
* n - length of buffer. Longer lines will be truncated and terminated with CR.
* pos - position in file is updated via this pointer * pos - position in file is updated via this pointer
*/ */
int16_t get_line(FILE *fp, uint8_t reset, char *writep, uint32_t *pos) { int16_t get_line(FILE *fp, uint8_t reset, char *writep, uint16_t n, uint32_t *pos) {
static uint16_t rd = 0; // Read static uint16_t rd = 0; // Read
static uint16_t end = 0; // End of valid data in buf static uint16_t end = 0; // End of valid data in buf
uint16_t i = 0; uint16_t i = 0;
@ -583,6 +585,11 @@ int16_t get_line(FILE *fp, uint8_t reset, char *writep, uint32_t *pos) {
} }
if (end == 0) if (end == 0)
return -1; // EOF return -1; // EOF
if (i == n - 1) {
writep[i - 1] = '\r';
writep[i] = '\0';
return i;
}
writep[i++] = buf[rd++]; writep[i++] = buf[rd++];
++(*pos); ++(*pos);
if (writep[i - 1] == '\r') { if (writep[i - 1] == '\r') {
@ -986,13 +993,13 @@ restart:
skipbytes = h->skipbytes; skipbytes = h->skipbytes;
free_headers_list(); free_headers_list();
get_line(fp, 1, linebuf, &pos); // Reset buffer get_line(fp, 1, linebuf, LINEBUFSZ, &pos); // Reset buffer
while (1) { while (1) {
if (!readp) if (!readp)
readp = linebuf; readp = linebuf;
if (!writep) if (!writep)
writep = linebuf; writep = linebuf;
if (get_line(fp, 0, writep, &pos) == -1) { if (get_line(fp, 0, writep, (LINEBUFSZ - (writep - linebuf)), &pos) == -1) {
eof = 1; eof = 1;
goto endscreen; goto endscreen;
} }
@ -1172,9 +1179,9 @@ retry:
mime = 1; mime = 1;
pos = 0; pos = 0;
fseek(fp, pos, SEEK_SET); fseek(fp, pos, SEEK_SET);
get_line(fp, 1, linebuf, &pos); // Reset buffer get_line(fp, 1, linebuf, LINEBUFSZ, &pos); // Reset buffer
do { do {
get_line(fp, 0, linebuf, &pos); get_line(fp, 0, linebuf, LINEBUFSZ, &pos);
if (!strncasecmp(linebuf, "Content-Transfer-Encoding: ", 27)) { if (!strncasecmp(linebuf, "Content-Transfer-Encoding: ", 27)) {
mime = 4; mime = 4;
if (!strncmp(linebuf + 27, "7bit", 4)) if (!strncmp(linebuf + 27, "7bit", 4))
@ -1572,10 +1579,10 @@ void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
mime = 0; mime = 0;
pos = 0; pos = 0;
fseek(fp, pos, SEEK_SET); fseek(fp, pos, SEEK_SET);
get_line(fp, 1, linebuf, &pos); // Reset buffer get_line(fp, 1, linebuf, LINEBUFSZ, &pos); // Reset buffer
do { do {
spinner(); spinner();
get_line(fp, 0, linebuf, &pos); get_line(fp, 0, linebuf, LINEBUFSZ, &pos);
if (!strncasecmp(linebuf, "MIME-Version: 1.0", 17)) if (!strncasecmp(linebuf, "MIME-Version: 1.0", 17))
mime = 1; mime = 1;
if (!strncasecmp(linebuf, "Content-Transfer-Encoding: ", 27)) { if (!strncasecmp(linebuf, "Content-Transfer-Encoding: ", 27)) {
@ -1600,13 +1607,13 @@ void get_email_body(struct emailhdrs *h, FILE *f, char mode) {
readp = linebuf; readp = linebuf;
writep = linebuf; writep = linebuf;
mime_binary = 0; mime_binary = 0;
get_line(fp, 1, linebuf, &pos); // Reset buffer get_line(fp, 1, linebuf, LINEBUFSZ, &pos); // Reset buffer
while (1) { while (1) {
if (!readp) if (!readp)
readp = linebuf; readp = linebuf;
if (!writep) if (!writep)
writep = linebuf; writep = linebuf;
if (get_line(fp, 0, writep, &pos) == -1) if (get_line(fp, 0, writep, (LINEBUFSZ - (writep - linebuf)), &pos) == -1)
break; break;
if ((mime >= 1) && (!strncmp(writep, "--", 2))) { if ((mime >= 1) && (!strncmp(writep, "--", 2))) {
if ((mime == 4) && !mime_binary) // End of Text/Plain MIME section if ((mime == 4) && !mime_binary) // End of Text/Plain MIME section