10 files changed, 51 insertions, 52 deletions

diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h
index 556ff26e621..f1c7356e6b0 100644
--- a/source/blender/blenkernel/BKE_packedFile.h
+++ b/source/blender/blenkernel/BKE_packedFile.h
@@ -51,7 +51,7 @@ struct PackedFile *newPackedFileMemory(void *mem, int memlen);
 void packAll(struct Main *bmain, struct ReportList *reports);
 
 /* unpack */
-char *unpackFile(struct ReportList *reports, char *abs_name, char *local_name, struct PackedFile *pf, int how);
+char *unpackFile(struct ReportList *reports, const char *abs_name, const char *local_name, struct PackedFile *pf, int how);
 int unpackVFont(struct ReportList *reports, struct VFont *vfont, int how);
 int unpackSound(struct Main *bmain, struct ReportList *reports, struct bSound *sound, int how);
 int unpackImage(struct ReportList *reports, struct Image *ima, int how);
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 1de581034a4..37982e7fec9 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -906,8 +906,8 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	
 	if (scene->r.stamp & R_STAMP_MARKER) {
 		char *name = scene_find_last_marker_name(scene, CFRA);
-	
-		if (name)	strcpy(text, name);
+
+		if (name)	BLI_strncpy(text, name, sizeof(text));
 		else 		strcpy(text, "<none>");
 
 		BLI_snprintf(stamp_data->marker, sizeof(stamp_data->marker), do_prefix ? "Marker %s":"%s", text);
@@ -980,7 +980,7 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
 	if (scene->r.stamp & R_STAMP_SEQSTRIP) {
 		Sequence *seq= seq_foreground_frame_get(scene, scene->r.cfra);
 	
-		if (seq) strcpy(text, seq->name+2);
+		if (seq)	BLI_strncpy(text, seq->name+2, sizeof(text));
 		else 		strcpy(text, "<none>");
 
 		BLI_snprintf(stamp_data->strip, sizeof(stamp_data->strip), do_prefix ? "Strip %s":"%s", text);
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 9de75a49998..2cee9676e5e 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -86,8 +86,8 @@ ModifierData *modifier_new(int type)
 	ModifierTypeInfo *mti = modifierType_getInfo(type);
 	ModifierData *md = MEM_callocN(mti->structSize, mti->structName);
 	
-	// FIXME: we need to make the name always be unique somehow...
-	strcpy(md->name, mti->name);
+	/* note, this name must be made unique later */
+	BLI_strncpy(md->name, mti->name, sizeof(md->name));
 
 	md->type = type;
 	md->mode = eModifierMode_Realtime
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index a46b358798a..cb1f52a6265 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -374,7 +374,7 @@ void nodeMakeDynamicType(bNode *node)
 		/*node->typeinfo= MEM_dupallocN(ntype);*/
 		bNodeType *newtype= MEM_callocN(sizeof(bNodeType), "dynamic bNodeType");
 		*newtype= *ntype;
-		strcpy(newtype->name, ntype->name);
+		BLI_strncpy(newtype->name, ntype->name, sizeof(newtype->name));
 		node->typeinfo= newtype;
 	}
 }
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index 2c8975e9cb4..0041cd33c14 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -182,7 +182,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char
 	
 	// convert relative filenames to absolute filenames
 	
-	strcpy(name, filename);
+	BLI_strncpy(name, filename, sizeof(name));
 	BLI_path_abs(name, basepath);
 	
 	// open the file
@@ -240,7 +240,7 @@ void packAll(Main *bmain, ReportList *reports)
 }
 
 
-/*
+#if 0
 
 // attempt to create a function that generates an unique filename
 // this will work when all funtions in fileops.c understand relative filenames...
@@ -249,6 +249,7 @@ static char *find_new_name(char *name)
 {
 	char tempname[FILE_MAXDIR + FILE_MAXFILE];
 	char *newname;
+	size_t len;
 	
 	if (fop_exists(name)) {
 		for (number = 1; number <= 999; number++) {
@@ -258,14 +259,12 @@ static char *find_new_name(char *name)
 			}
 		}
 	}
-	
-	newname = mallocN(strlen(tempname) + 1, "find_new_name");
-	strcpy(newname, tempname);
-	
-	return(newname);
+	len= strlen(tempname) + 1;
+	newname = MEM_mallocN(len, "find_new_name");
+	memcpy(newname, tempname, len * sizeof(char));
+	return newname;
 }
-	
-*/
+#endif
 
 int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, int guimode)
 {
@@ -277,12 +276,12 @@ int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, i
 	
 	if (guimode) {} //XXX  waitcursor(1);
 	
-	strcpy(name, filename);
+	BLI_strncpy(name, filename, sizeof(name));
 	BLI_path_abs(name, G.main->name);
 	
 	if (BLI_exists(name)) {
 		for (number = 1; number <= 999; number++) {
-			sprintf(tempname, "%s.%03d_", name, number);
+			BLI_snprintf(tempname, sizeof(tempname), "%s.%03d_", name, number);
 			if (! BLI_exists(tempname)) {
 				if (BLI_copy_fileops(name, tempname) == RET_OK) {
 					remove_tmp = TRUE;
@@ -342,7 +341,7 @@ int checkPackedFile(const char *filename, PackedFile *pf)
 	char buf[4096];
 	char name[FILE_MAXDIR + FILE_MAXFILE];
 	
-	strcpy(name, filename);
+	BLI_strncpy(name, filename, sizeof(name));
 	BLI_path_abs(name, G.main->name);
 	
 	if (stat(name, &st)) {
@@ -392,9 +391,10 @@ there was an error or when the user desides to cancel the operation.
 
 */
 
-char *unpackFile(ReportList *reports, char *abs_name, char *local_name, PackedFile *pf, int how)
+char *unpackFile(ReportList *reports, const char *abs_name, const char *local_name, PackedFile *pf, int how)
 {
-	char *newname = NULL, *temp = NULL;
+	char *newname = NULL;
+	const char *temp = NULL;
 	
 	// char newabs[FILE_MAXDIR + FILE_MAXFILE];
 	// char newlocal[FILE_MAXDIR + FILE_MAXFILE];
@@ -437,12 +437,11 @@ char *unpackFile(ReportList *reports, char *abs_name, char *local_name, PackedFi
 		}
 		
 		if (temp) {
-			newname = MEM_mallocN(strlen(temp) + 1, "unpack_file newname");
-			strcpy(newname, temp);
+			newname= BLI_strdup(temp);
 		}
 	}
 	
-	return (newname);
+	return newname;
 }
 
 
@@ -453,17 +452,17 @@ int unpackVFont(ReportList *reports, VFont *vfont, int how)
 	int ret_value = RET_ERROR;
 	
 	if (vfont != NULL) {
-		strcpy(localname, vfont->name);
+		BLI_strncpy(localname, vfont->name, sizeof(localname));
 		BLI_splitdirstring(localname, fi);
 		
-		sprintf(localname, "//fonts/%s", fi);
+		BLI_snprintf(localname, sizeof(localname), "//fonts/%s", fi);
 		
 		newname = unpackFile(reports, vfont->name, localname, vfont->packedfile, how);
 		if (newname != NULL) {
 			ret_value = RET_OK;
 			freePackedFile(vfont->packedfile);
 			vfont->packedfile = NULL;
-			strcpy(vfont->name, newname);
+			BLI_strncpy(vfont->name, newname, sizeof(vfont->name));
 			MEM_freeN(newname);
 		}
 	}
@@ -478,13 +477,13 @@ int unpackSound(Main *bmain, ReportList *reports, bSound *sound, int how)
 	int ret_value = RET_ERROR;
 
 	if (sound != NULL) {
-		strcpy(localname, sound->name);
+		BLI_strncpy(localname, sound->name, sizeof(localname));
 		BLI_splitdirstring(localname, fi);
-		sprintf(localname, "//sounds/%s", fi);
+		BLI_snprintf(localname, sizeof(localname), "//sounds/%s", fi);
 
 		newname = unpackFile(reports, sound->name, localname, sound->packedfile, how);
 		if (newname != NULL) {
-			strcpy(sound->name, newname);
+			BLI_strncpy(sound->name, newname, sizeof(sound->name));
 			MEM_freeN(newname);
 
 			freePackedFile(sound->packedfile);
@@ -506,16 +505,16 @@ int unpackImage(ReportList *reports, Image *ima, int how)
 	int ret_value = RET_ERROR;
 	
 	if (ima != NULL) {
-		strcpy(localname, ima->name);
+		BLI_strncpy(localname, ima->name, sizeof(localname));
 		BLI_splitdirstring(localname, fi);
-		sprintf(localname, "//textures/%s", fi);
-			
+		BLI_snprintf(localname, sizeof(localname), "//textures/%s", fi);
+
 		newname = unpackFile(reports, ima->name, localname, ima->packedfile, how);
 		if (newname != NULL) {
 			ret_value = RET_OK;
 			freePackedFile(ima->packedfile);
 			ima->packedfile = NULL;
-			strcpy(ima->name, newname);
+			BLI_strncpy(ima->name, newname, sizeof(ima->name));
 			MEM_freeN(newname);
 			BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
 		}
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index bc5bc87b1fa..8e5452e2704 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -2891,24 +2891,24 @@ void BKE_ptcache_disk_cache_rename(PTCacheID *pid, char *from, char *to)
 	char ext[MAX_PTCACHE_PATH];
 
 	/* save old name */
-	strcpy(old_name, pid->cache->name);
+	BLI_strncpy(old_name, pid->cache->name, sizeof(old_name));
 
 	/* get "from" filename */
-	strcpy(pid->cache->name, from);
+	BLI_strncpy(pid->cache->name, from, sizeof(pid->cache->name));
 
 	len = ptcache_filename(pid, old_filename, 0, 0, 0); /* no path */
 
 	ptcache_path(pid, path);
 	dir = opendir(path);
 	if(dir==NULL) {
-		strcpy(pid->cache->name, old_name);
+		BLI_strncpy(pid->cache->name, old_name, sizeof(pid->cache->name));
 		return;
 	}
 
 	BLI_snprintf(ext, sizeof(ext), "_%02u"PTCACHE_EXT, pid->stack_index);
 
 	/* put new name into cache */
-	strcpy(pid->cache->name, to);
+	BLI_strncpy(pid->cache->name, to, sizeof(pid->cache->name));
 
 	while ((de = readdir(dir)) != NULL) {
 		if (strstr(de->d_name, ext)) { /* do we have the right extension?*/
@@ -2963,7 +2963,7 @@ void BKE_ptcache_load_external(PTCacheID *pid)
 	if(cache->index >= 0)
 		BLI_snprintf(ext, sizeof(ext), "_%02d"PTCACHE_EXT, cache->index);
 	else
-		strcpy(ext, PTCACHE_EXT);
+		BLI_strncpy(ext, PTCACHE_EXT, sizeof(ext));
 	
 	while ((de = readdir(dir)) != NULL) {
 		if (strstr(de->d_name, ext)) { /* do we have the right extension?*/
diff --git a/source/blender/blenkernel/intern/property.c b/source/blender/blenkernel/intern/property.c
index cdf2e39a4dd..e0e2876f79e 100644
--- a/source/blender/blenkernel/intern/property.c
+++ b/source/blender/blenkernel/intern/property.c
@@ -166,7 +166,7 @@ void unique_property(bProperty *first, bProperty *prop, int force)
 			int i= 0;
 
 			/* strip numbers */
-			strcpy(base_name, prop->name);
+			BLI_strncpy(base_name, prop->name, sizeof(base_name));
 			for(i= strlen(base_name)-1; (i>=0 && isdigit(base_name[i])); i--) {
 				base_name[i]= '\0';
 			}
@@ -178,7 +178,7 @@ void unique_property(bProperty *first, bProperty *prop, int force)
 				strcat(new_name, num);
 			} while(get_property__internal(first, prop, new_name));
 
-			strcpy(prop->name, new_name);
+			BLI_strncpy(prop->name, new_name, sizeof(prop->name));
 		}
 	}
 }
@@ -257,7 +257,7 @@ void set_property(bProperty *prop, char *str)
 		*((float *)&prop->data)= (float)atof(str);
 		break;
 	case GPROP_STRING:
-		strcpy(prop->poin, str);
+		strcpy(prop->poin, str); /* TODO - check size? */
 		break;
 	}
 	
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 00534400cf1..a7c19130929 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -866,8 +866,8 @@ void seqbase_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq)
 	SeqUniqueInfo sui;
 	char *dot;
 	sui.seq= seq;
-	strcpy(sui.name_src, seq->name+2);
-	strcpy(sui.name_dest, seq->name+2);
+	BLI_strncpy(sui.name_src, seq->name+2, sizeof(sui.name_src));
+	BLI_strncpy(sui.name_dest, seq->name+2, sizeof(sui.name_dest));
 
 	sui.count= 1;
 	sui.match= 1; /* assume the worst to start the loop */
@@ -887,7 +887,7 @@ void seqbase_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq)
 		seqbase_recursive_apply(seqbasep, seqbase_unique_name_recursive_cb, &sui);
 	}
 
-	strcpy(seq->name+2, sui.name_dest);
+	BLI_strncpy(seq->name+2, sui.name_dest, sizeof(seq->name)-2);
 }
 
 static const char *give_seqname_by_type(int type)
@@ -1204,7 +1204,7 @@ static int seq_proxy_get_fname(SeqRenderData context, Sequence * seq, int cfra,
 	   sorry folks, please rebuild your proxies... */
 
 	if (seq->flag & (SEQ_USE_PROXY_CUSTOM_DIR|SEQ_USE_PROXY_CUSTOM_FILE)) {
-		strcpy(dir, seq->strip->proxy->dir);
+		BLI_strncpy(dir, seq->strip->proxy->dir, sizeof(dir));
 	} else if (seq->type == SEQ_IMAGE) {
 		BLI_snprintf(dir, PROXY_MAXFILE, "%s/BL_proxy", seq->strip->dir);
 	} else {
@@ -3360,9 +3360,9 @@ int seq_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
 	SWAP(Sequence, *seq_a, *seq_b);
 
 	/* swap back names so animation fcurves dont get swapped */
-	strcpy(name, seq_a->name+2);
-	strcpy(seq_a->name+2, seq_b->name+2);
-	strcpy(seq_b->name+2, name);
+	BLI_strncpy(name, seq_a->name+2, sizeof(name));
+	BLI_strncpy(seq_a->name+2, seq_b->name+2, sizeof(seq_b->name)-2);
+	BLI_strncpy(seq_b->name+2, name, sizeof(seq_b->name)-2);
 
 	/* swap back opacity, and overlay mode */
 	SWAP(int, seq_a->blend_mode, seq_b->blend_mode);
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 07df12d5468..02e381fe9b4 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -79,9 +79,9 @@ struct bSound* sound_new_file(struct Main *bmain, const char *filename)
 	char str[FILE_MAX];
 	char *path;
 
-	int len;
+	size_t len;
 
-	strcpy(str, filename);
+	BLI_strncpy(str, filename, sizeof(str));
 
 	path = /*bmain ? bmain->name :*/ G.main->name;
 
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index d344f79bb6c..7d720aed62c 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -992,7 +992,7 @@ void autotexname(Tex *tex)
 		if(tex->type==TEX_IMAGE) {
 			ima= tex->ima;
 			if(ima) {
-				strcpy(di, ima->name);
+				BLI_strncpy(di, ima->name, sizeof(di));
 				BLI_splitdirstring(di, fi);
 				strcpy(di, "I.");
 				strcat(di, fi);