empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Factor out code to read mailboxes, and make read more robust

Browse source 
New tel_read_header(), tel_read_body().  Use them in rea(),
show_first_tel(), copy_and_expire().

rea() now stops when it encounters a corrupt telegram, and logs the
problem.  Before, error detection was incomplete, and errors were not
logged.  Corrupt mailboxes could make it crash.

show_first_tel() and copy_and_expire() can now cope with telegrams of
arbitrary length, like rea(), and sanity-check the header fields they
don't actually use.
This commit is contained in:
Markus Armbruster 2009-02-08 11:13:25 +01:00
parent 6f1e669bea
commit 4238323d63
5 changed files with 114 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib/player/player.c
View file

@ -53,6 +53,7 @@
static int command(void);
static int status(void);
static int print_sink(char *, size_t, void *);
struct player *player;
@ -269,7 +270,6 @@ show_first_tel(char *fname)
{
FILE *fp;
struct telstr tgm;
char buf[MAXTELSIZE + 1]; /* UTF-8 */
if ((fp = fopen(fname, "rb")) == NULL) {
if (errno == ENOENT)
@ -279,28 +279,21 @@ show_first_tel(char *fname)
return -1;
}
}
if (fread(&tgm, sizeof(tgm), 1, fp) != 1) {
logerror("bad header on login message (%s)", fname);
fclose(fp);
if (tel_read_header(fp, fname, &tgm) < 0)
return -1;
}
if (tgm.tel_length >= sizeof(buf)) {
logerror("text length (%u) is too long for login message (motdfil)",
tgm.tel_length);
fclose(fp);
if (tel_read_body(fp, fname, &tgm, print_sink, NULL) < 0)
return -1;
}
if (fread(buf, tgm.tel_length, 1, fp) != 1) {
logerror("bad length %u on login message", tgm.tel_length);
fclose(fp);
return -1;
}
buf[tgm.tel_length] = 0;
uprnf(buf);
fclose(fp);
return 0;
}
static int
print_sink(char *chunk, size_t sz, void *arg)
{
uprnf(chunk);
return 0;
}
int
quit(void)
{