$OpenBSD$

Avoid strcpy(), strcat(), and sprintf().

--- src/disc.c.orig	Thu Oct  3 20:01:15 2013
+++ src/disc.c	Sun Aug 23 00:05:08 2015
@@ -45,11 +45,11 @@
 	( i >= disc->first_track_num && i <= disc->last_track_num )
 
 
-static void create_disc_id(mb_disc_private *d, char buf[]);
-static void create_freedb_disc_id(mb_disc_private *d, char buf[]);
+static void create_disc_id(mb_disc_private *d, char buf[], size_t buflen);
+static void create_freedb_disc_id(mb_disc_private *d, char buf[], size_t buflen);
 static char *create_toc_string(mb_disc_private *d, char *sep);
-static void create_submission_url(mb_disc_private *d, char buf[]);
-static void create_webservice_url(mb_disc_private *d, char buf[]);
+static void create_submission_url(mb_disc_private *d, char buf[], size_t buflen);
+static void create_webservice_url(mb_disc_private *d, char buf[], size_t buflen);
 
 
 /****************************************************************************
@@ -86,7 +86,7 @@ char *discid_get_id(DiscId *d) {
 		return NULL;
 
 	if (strlen(disc->id) == 0)
-		create_disc_id(disc, disc->id);
+		create_disc_id(disc, disc->id, sizeof(disc->id));
 
 	return disc->id;
 }
@@ -101,7 +101,7 @@ char *discid_get_freedb_id(DiscId *d) {
 		return NULL;
 
 	if (strlen(disc->freedb_id) == 0)
-		create_freedb_disc_id(disc, disc->freedb_id);
+		create_freedb_disc_id(disc, disc->freedb_id, sizeof(disc->freedb_id));
 
 	return disc->freedb_id;
 }
@@ -117,7 +117,7 @@ char *discid_get_toc_string(DiscId *d) {
 	if ( strlen(disc->toc_string) == 0 ) {
 		char *toc = create_toc_string(disc, " ");
 		if (toc) {
-			memcpy(disc->toc_string, toc, strlen(toc) + 1);
+			strlcpy(disc->toc_string, toc, sizeof(disc->toc_string));
 			free(toc);
 		}
 	}
@@ -134,7 +134,7 @@ char *discid_get_submission_url(DiscId *d) {
 		return NULL;
 
 	if (strlen(disc->submission_url) == 0)
-		create_submission_url(disc, disc->submission_url);
+		create_submission_url(disc, disc->submission_url, sizeof(disc->submission_url));
 
 	return disc->submission_url;
 }
@@ -148,7 +148,7 @@ char *discid_get_webservice_url(DiscId *d) {
 		return NULL;
 
 	if (strlen(disc->webservice_url) == 0)
-		create_webservice_url(disc, disc->webservice_url);
+		create_webservice_url(disc, disc->webservice_url, sizeof(disc->webservice_url));
 
 	return disc->webservice_url;
 }
@@ -192,25 +192,25 @@ int discid_put(DiscId *d, int first, int last, int *of
 	if (first > last || first < 1
 			|| first > 99 || last < 1 || last > 99) {
 
-		sprintf(disc->error_msg, "Illegal track limits");
+		snprintf(disc->error_msg, sizeof(disc->error_msg), "Illegal track limits");
 		return 0;
 	}
 	if (offsets == NULL) {
-		sprintf(disc->error_msg, "No offsets given");
+		snprintf(disc->error_msg, sizeof(disc->error_msg), "No offsets given");
 		return 0;
 	}
 	disc_length = offsets[0];
 	if (disc_length > MAX_DISC_LENGTH) {
-		sprintf(disc->error_msg, "Disc too long");
+		snprintf(disc->error_msg, sizeof(disc->error_msg), "Disc too long");
 		return 0;
 	}
 	for (i = 0; i <= last; i++) {
 		if (offsets[i] > disc_length) {
-			sprintf(disc->error_msg, "Invalid offset");
+			snprintf(disc->error_msg, sizeof(disc->error_msg), "Invalid offset");
 			return 0;
 		}
 		if (i > 1 && offsets[i-1] > offsets[i]) {
-			sprintf(disc->error_msg, "Invalid order");
+			snprintf(disc->error_msg, sizeof(disc->error_msg), "Invalid order");
 			return 0;
 		}
 	}
@@ -360,7 +360,7 @@ char *discid_get_version_string(void) {
  * Create a DiscID based on the TOC data found in the DiscId object.
  * The DiscID is placed in the provided string buffer.
  */
-static void create_disc_id(mb_disc_private *d, char buf[]) {
+static void create_disc_id(mb_disc_private *d, char buf[], size_t buflen) {
 	SHA_INFO	sha;
 	unsigned char	digest[20], *base64;
 	unsigned long	size;
@@ -372,14 +372,14 @@ static void create_disc_id(mb_disc_private *d, char bu
 
 	sha_init(&sha);
 
-	sprintf(tmp, "%02X", d->first_track_num);
+	snprintf(tmp, sizeof(tmp), "%02X", d->first_track_num);
 	sha_update(&sha, (unsigned char *) tmp, strlen(tmp));
 
-	sprintf(tmp, "%02X", d->last_track_num);
+	snprintf(tmp, sizeof(tmp), "%02X", d->last_track_num);
 	sha_update(&sha, (unsigned char *) tmp, strlen(tmp));
 
 	for (i = 0; i < 100; i++) {
-		sprintf(tmp, "%08X", d->track_offsets[i]);
+		snprintf(tmp, sizeof(tmp), "%08X", d->track_offsets[i]);
 		sha_update(&sha, (unsigned char *) tmp, strlen(tmp));
 	}
 
@@ -387,8 +387,7 @@ static void create_disc_id(mb_disc_private *d, char bu
 
 	base64 = rfc822_binary(digest, sizeof(digest), &size);
 
-	memcpy(buf, base64, size);
-	buf[size] = '\0';
+	strlcpy(buf, base64, buflen);
 
 	free(base64);
 }
@@ -398,7 +397,7 @@ static void create_disc_id(mb_disc_private *d, char bu
  * Create a FreeDB DiscID based on the TOC data found in the DiscId object.
  * The DiscID is placed in the provided string buffer.
  */
-static void create_freedb_disc_id(mb_disc_private *d, char buf[]) {
+static void create_freedb_disc_id(mb_disc_private *d, char buf[], size_t buflen) {
 	int i, n, m, t;
 
 	assert(d != NULL);
@@ -413,7 +412,7 @@ static void create_freedb_disc_id(mb_disc_private *d, 
 		}
 	}
 	t = d->track_offsets[0] / 75 - d->track_offsets[1] / 75;
-	sprintf(buf, "%08x", ((n % 0xff) << 24 | t << 8 | d->last_track_num));
+	snprintf(buf, buflen, "%08x", ((n % 0xff) << 24 | t << 8 | d->last_track_num));
 }
 
 /*
@@ -443,7 +442,7 @@ static char *create_toc_string(mb_disc_private *d, cha
 	toc = calloc(size, sizeof(char));
 	if (!toc) return NULL;
 
-	sprintf(toc, "%d%s%d%s%d",
+	snprintf(toc, size, "%d%s%d%s%d",
 			d->first_track_num,
 			sep,
 			d->last_track_num,
@@ -451,19 +450,19 @@ static char *create_toc_string(mb_disc_private *d, cha
 			d->track_offsets[0]);
 
 	for (i = d->first_track_num; i <= d->last_track_num; i++) {
-		sprintf(tmp, "%s%d", sep, d->track_offsets[i]);
-		strcat(toc, tmp);
+		snprintf(tmp, sizeof(tmp), "%s%d", sep, d->track_offsets[i]);
+		strlcat(toc, tmp, size);
 	}
 
 	return toc;
 }
 
 /* Append &toc=... to buf, calling  create_toc_string() */
-static void cat_toc_param(mb_disc_private *d, char *buf) {
+static void cat_toc_param(mb_disc_private *d, char *buf, size_t buflen) {
 	char *toc = create_toc_string(d, "+");
 	if (toc) {
-		strcat(buf, "&toc=");
-		strcat(buf, toc);
+		strlcat(buf, "&toc=", buflen);
+		strlcat(buf, toc, buflen);
 		free(toc);
 	}
 }
@@ -472,37 +471,26 @@ static void cat_toc_param(mb_disc_private *d, char *bu
  * Create a submission URL based on the TOC data found in the mb_disc_private
  * object. The URL is placed in the provided string buffer.
  */
-static void create_submission_url(mb_disc_private *d, char buf[]) {
-	char tmp[16];
-
+static void create_submission_url(mb_disc_private *d, char buf[], size_t buflen) {
 	assert(d != NULL);
 	assert(d->success);
 
-	strcpy(buf, MB_SUBMISSION_URL);
+	snprintf(buf, buflen, "%s?id=%s&tracks=%d", MB_SUBMISSION_URL, discid_get_id((DiscId *) d), d->last_track_num);
 
-	strcat(buf, "?id=");
-	strcat(buf, discid_get_id((DiscId *) d));
-
-	sprintf(tmp, "&tracks=%d", d->last_track_num);
-	strcat(buf, tmp);
-
-	cat_toc_param(d, buf);
+	cat_toc_param(d, buf, buflen);
 }
 
 /*
  * Create a web service URL based on the TOC data found in the mb_disc_private
  * object. The URL is placed in the provided string buffer.
  */
-static void create_webservice_url(mb_disc_private *d, char buf[]) {
+static void create_webservice_url(mb_disc_private *d, char buf[], size_t buflen) {
 	assert(d != NULL);
 	assert(d->success);
 
-	strcpy(buf, MB_WEBSERVICE_URL);
+	snprintf(buf, buflen, "%s?type=xml&discid=%s", MB_WEBSERVICE_URL, discid_get_id((DiscId *) d));
 
-	strcat(buf, "?type=xml&discid=");
-	strcat(buf, discid_get_id((DiscId *) d));
-
-	cat_toc_param(d, buf);
+	cat_toc_param(d, buf, buflen);
 }
 
 /* EOF */
