mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 04:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

use robust handling of time_t value (de)serialisation

Browse Source 
The previous implementation was wrong on systems where time_t was not
an int type. This changes urldb to use the portable implementation
netsurf has available.
This commit is contained in:
Vincent Sanders 2017-03-08 10:54:17 +00:00
parent 4076cc64d2
commit 670110b171
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
content/urldb.c
View File

@ -311,6 +311,27 @@ static struct bloom_filter *url_bloom;
#define BLOOM_SIZE (1024 * 32) #define BLOOM_SIZE (1024 * 32)
/**
* write a time_t to a file portably
*
* \param fp File to write to
* \param val the unix time value to output
* \return NSERROR_OK on success
*/
static nserror urldb_write_timet(FILE *fp, time_t val)
{
int use;
char op[32];
use = nsc_sntimet(op, 32, &val);
if (use == 0) {
fprintf(fp, "%i\n", (int)val);
} else {
fprintf(fp, "%.*s\n", use, op);
}
return NSERROR_OK;
}
/** /**
* Write paths associated with a host * Write paths associated with a host
* *
@ -383,9 +404,14 @@ urldb_write_paths(const struct path_data *parent,
/** \todo handle fragments? */ /** \todo handle fragments? */
fprintf(fp, "%i\n%i\n%i\n", p->urld.visits, /* number of visits */
(int)p->urld.last_visit, fprintf(fp, "%i\n", p->urld.visits);
(int)p->urld.type);
/* time entry was last used */
urldb_write_timet(fp, p->urld.last_visit);
/* entry type */
fprintf(fp, "%i\n", (int)p->urld.type);
fprintf(fp, "\n"); fprintf(fp, "\n");
@ -2806,10 +2832,13 @@ nserror urldb_load(const char *filename)
if (p) if (p)
p->urld.visits = (unsigned int)atoi(s); p->urld.visits = (unsigned int)atoi(s);
if (!fgets(s, MAXIMUM_URL_LENGTH, fp)) /* entry last use time */
if (!fgets(s, MAXIMUM_URL_LENGTH, fp)) {
break; break;
if (p) }
p->urld.last_visit = (time_t)atoi(s); if (p) {
nsc_snptimet(s, strlen(s) - 1, &p->urld.last_visit);
}
if (!fgets(s, MAXIMUM_URL_LENGTH, fp)) if (!fgets(s, MAXIMUM_URL_LENGTH, fp))
break; break;