Attachment #13558 for bug #25737

View | Details | Raw Unified | Return to bug 25737
Collapse All | Expand All




					displaytitle[length] = '%';
					break;
				case TAG_ARTIST:
				  if (artist) {
					tmp = strlen(artist);
					if (tmp != 0)
						got_field = TRUE;
					strncpy(&displaytitle[length], artist, tmp);
				  }
					break;
				case TAG_TITLE:
				  if (title) {
					tmp = strlen(title);
					if (tmp != 0)
						got_field = TRUE;
					strncpy(&displaytitle[length], title, tmp);
				  }
					break;
				case TAG_ALBUM:
				  if (album) {
					tmp = strlen(album);
					if (tmp != 0)
						got_field = TRUE;
					strncpy(&displaytitle[length], album, tmp);
				  }
					break;
				case TAG_DATE:
				  if (date) {
					tmp = strlen(date);
					if (tmp != 0)
						got_field = TRUE;
					strncpy(&displaytitle[length], date, tmp);
				  }
					break;
				case TAG_TRACKNUMBER:
				  if (tracknumber) {
					tmp = strlen(tracknumber);
					if (tmp != 0)
						got_field = TRUE;
					strncpy(&displaytitle[length], tracknumber, tmp);
				  }
					break;
				case FILE_NAME:
					strncpy(&displaytitle[length], base, tmp = baselen);

Return to bug 25737

Lines 547-580 Link Here

(-)Input/vorbis/vorbis.c (+10 lines)
547	displaytitle[length] = '%';	547	displaytitle[length] = '%';
548	break;	548	break;
549	case TAG_ARTIST:	549	case TAG_ARTIST:
		550	if (artist) {
550	tmp = strlen(artist);	551	tmp = strlen(artist);
551	if (tmp != 0)	552	if (tmp != 0)
552	got_field = TRUE;	553	got_field = TRUE;
553	strncpy(&displaytitle[length], artist, tmp);	554	strncpy(&displaytitle[length], artist, tmp);
		555	}
554	break;	556	break;
555	case TAG_TITLE:	557	case TAG_TITLE:
		558	if (title) {
556	tmp = strlen(title);	559	tmp = strlen(title);
557	if (tmp != 0)	560	if (tmp != 0)
558	got_field = TRUE;	561	got_field = TRUE;
559	strncpy(&displaytitle[length], title, tmp);	562	strncpy(&displaytitle[length], title, tmp);
		563	}
560	break;	564	break;
561	case TAG_ALBUM:	565	case TAG_ALBUM:
		566	if (album) {
562	tmp = strlen(album);	567	tmp = strlen(album);
563	if (tmp != 0)	568	if (tmp != 0)
564	got_field = TRUE;	569	got_field = TRUE;
565	strncpy(&displaytitle[length], album, tmp);	570	strncpy(&displaytitle[length], album, tmp);
		571	}
566	break;	572	break;
567	case TAG_DATE:	573	case TAG_DATE:
		574	if (date) {
568	tmp = strlen(date);	575	tmp = strlen(date);
569	if (tmp != 0)	576	if (tmp != 0)
570	got_field = TRUE;	577	got_field = TRUE;
571	strncpy(&displaytitle[length], date, tmp);	578	strncpy(&displaytitle[length], date, tmp);
		579	}
572	break;	580	break;
573	case TAG_TRACKNUMBER:	581	case TAG_TRACKNUMBER:
		582	if (tracknumber) {
574	tmp = strlen(tracknumber);	583	tmp = strlen(tracknumber);
575	if (tmp != 0)	584	if (tmp != 0)
576	got_field = TRUE;	585	got_field = TRUE;
577	strncpy(&displaytitle[length], tracknumber, tmp);	586	strncpy(&displaytitle[length], tracknumber, tmp);
		587	}
578	break;	588	break;
579	case FILE_NAME:	589	case FILE_NAME:
580	strncpy(&displaytitle[length], base, tmp = baselen);	590	strncpy(&displaytitle[length], base, tmp = baselen);