Merge commit 'ff48e71434a414958e6e56628ccf04284d030784' into master-merge

[xonotic/netradiant.git] / libs / picomodel / pm_lwo.c

diff --git a/libs/picomodel/pm_lwo.c b/libs/picomodel/pm_lwo.c
index 6cbf0f4c162d50916f4fec5674d42ef87011e423..6431dc2b2e236f5396c585a4f0605e518d599e09 100644 (file)
--- a/libs/picomodel/pm_lwo.c
+++ b/libs/picomodel/pm_lwo.c
@@ -100,7 +100,8 @@ static picoModel_t *_lwo_load( PM_PARAMS_LOAD ){
        lwPolygon       *pol;
        lwPolVert       *v;
        lwVMapPt        *vm;
-       char name[ 256 ];
+       char name[256];
+       name[255] = '\0';
        int i, j, k, numverts;
 
        picoModel_t     *picoModel;
@@ -231,9 +232,9 @@ static picoModel_t *_lwo_load( PM_PARAMS_LOAD ){
                }
 
                /* detox and set shader name */
-               strncpy( name, surface->name, sizeof( name ) );
+               strncpy( name, surface->name, sizeof( name ) - 1 );
                _pico_first_token( name );
-               _pico_setfext( name, "" );
+               _pico_setfext( name, NULL );
                _pico_unixify( name );
                PicoSetShaderName( picoShader, name );