summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
168a9ad)
if not all of the time this function is applied on a database entry.
Too prone to dangerous oversight.
* fixed bsdcal export not checking for validity of parsed date.
int day, month, year;
char buf[64];
int day, month, year;
char buf[64];
- /* put raw representation of date in buf */
find_field_number(cur->field->key, &nb);
find_field_number(cur->field->key, &nb);
- if((str = db_fget_byid(item, nb)) != NULL)
- strncpy(buf, str, sizeof(buf));
-
- if(str && parse_date_string(buf, &day, &month, &year)) {
+ str = db_fget_byid(item, nb);
+
+ if(parse_date_string(str, &day, &month, &year)) {
/* put locale representation of date in buf */
locale_date(buf, sizeof(buf), year, month, day);
mvwaddnstr(editw, y, TAB_COLON_POS + 2, buf,
/* put locale representation of date in buf */
locale_date(buf, sizeof(buf), year, month, day);
mvwaddnstr(editw, y, TAB_COLON_POS + 2, buf,
-parse_date_string(char *s, int *day, int *month, int *year)
+parse_date_string(char *str, int *day, int *month, int *year)
- char *p = s;
- assert(s && day && month && year);
+ char buf[12], *s, *p;
+
+ assert(day && month && year);
+
+ if(!str || !*str)
+ return FALSE;
+
+ p = s = strncpy(buf, str, sizeof(buf));
if(*s == '-' && *s++ == '-') { /* omitted year */
*year = 0;
if(*s == '-' && *s++ == '-') { /* omitted year */
*year = 0;
static void
edit_date(int item, int nb)
{
static void
edit_date(int item, int nb)
{
- int i, date[3], old = FALSE;
- char buf[12], *s = db_fget_byid(item, nb);
+ int i, date[3], old;
+ char *s = db_fget_byid(item, nb);
char *field[] = { N_("Day: "), N_("Month: "), N_("Year (optional): ") };
char *field[] = { N_("Day: "), N_("Month: "), N_("Year (optional): ") };
- if(s) {
- strncpy(buf, s, sizeof(buf));
- old = parse_date_string(buf, &date[0], &date[1], &date[2]);
- }
+ old = parse_date_string(s, &date[0], &date[1], &date[2]);
for(i = 0; i < 3; i++) {
s = (old && date[i]) ? strdup_printf("%d", date[i]) : NULL;
for(i = 0; i < 3; i++) {
s = (old && date[i]) ? strdup_printf("%d", date[i]) : NULL;
char *anniversary = db_fget(e.item, ANNIVERSARY);
if(anniversary) {
char *anniversary = db_fget(e.item, ANNIVERSARY);
if(anniversary) {
- parse_date_string(anniversary, &day, &month, &year);
+ if(!parse_date_string(anniversary, &day, &month, &year))
+ continue;
fprintf(out,
_("%02d/%02d\tAnniversary of %s\n"),
fprintf(out,
_("%02d/%02d\tAnniversary of %s\n"),