projects
/
platform
/
upstream
/
flac.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace broken str* functions with safe versions.
[platform/upstream/flac.git]
/
src
/
share
/
grabbag
/
cuesheet.c
diff --git
a/src/share/grabbag/cuesheet.c
b/src/share/grabbag/cuesheet.c
index
15ca5f3
..
76d49c4
100644
(file)
--- a/
src/share/grabbag/cuesheet.c
+++ b/
src/share/grabbag/cuesheet.c
@@
-20,12
+20,13
@@
# include <config.h>
#endif
# include <config.h>
#endif
-#include "share/grabbag.h"
-#include "share/compat.h"
-#include "FLAC/assert.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "FLAC/assert.h"
+#include "share/compat.h"
+#include "share/grabbag.h"
+#include "share/safe_str.h"
unsigned grabbag__cuesheet_msf_to_frame(unsigned minutes, unsigned seconds, unsigned frames)
{
unsigned grabbag__cuesheet_msf_to_frame(unsigned minutes, unsigned seconds, unsigned frames)
{
@@
-292,7
+293,7
@@
static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
*error_message = "CD-DA CATALOG number must be 13 decimal digits";
return false;
}
*error_message = "CD-DA CATALOG number must be 13 decimal digits";
return false;
}
- s
trcpy(cs->media_catalog_number, field
);
+ s
afe_strncpy(cs->media_catalog_number, field, sizeof(cs->media_catalog_number)
);
disc_has_catalog = true;
}
else if(0 == FLAC__STRCASECMP(field, "FLAGS")) {
disc_has_catalog = true;
}
else if(0 == FLAC__STRCASECMP(field, "FLAGS")) {
@@
-421,7
+422,7
@@
static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message,
*error_message = "invalid ISRC number";
return false;
}
*error_message = "invalid ISRC number";
return false;
}
- s
trcpy(cs->tracks[cs->num_tracks-1].isrc, field
);
+ s
afe_strncpy(cs->tracks[cs->num_tracks-1].isrc, field, sizeof(cs->tracks[cs->num_tracks-1].isrc)
);
track_has_isrc = true;
}
else if(0 == FLAC__STRCASECMP(field, "TRACK")) {
track_has_isrc = true;
}
else if(0 == FLAC__STRCASECMP(field, "TRACK")) {