diff options
author | Ton Roosendaal <ton@blender.org> | 2005-03-24 12:37:06 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-03-24 12:37:06 +0300 |
commit | 7b6ec97182f0c4a3dbc53ed09c6cb50168c5812f (patch) | |
tree | ef69a0b72eed00697de6ed19e9330bf1d4b89fff /source/blender/src/drawseq.c | |
parent | 8b69f0cfd914762c30586e042510109e4f1c2712 (diff) |
Bug fix #2311
File name (40) and dirname (80) were too short in sequence data. Made it
compliant using defines FILE_MAXFILE and FILE_MAXDIR.
Also replaced all strcpy() and strcat() with strncpy/strncat, with the
defines in it.
Oh, also fixed plugin path length for sequence, was just 80!
Bug fix #2366
Restored old convention that made using SHIFT+CTRL while using button-
sliders go with 0.1 stepsize of CTRL.
(noticed too late that Chris Burt assigned to self... sorry!)
Diffstat (limited to 'source/blender/src/drawseq.c')
-rw-r--r-- | source/blender/src/drawseq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index 0afcc1aa1a3..51923915823 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -526,7 +526,7 @@ static void draw_extra_seqinfo(void) /* NAME */ glRasterPos3f(xco, 0.3, 0.0); - strcpy(str, give_seqname(last_seq)); + strncpy(str, give_seqname(last_seq), 255); BMF_DrawString(G.font, str); xco += xfac*BMF_GetStringWidth(G.font, str) +30.0*xfac; @@ -710,8 +710,8 @@ static void seq_panel_properties(short cntrl) // SEQ_HANDLER_PROPERTIES if(last_seq->type==SEQ_WIPE){ WipeVars *wipe = (WipeVars *)last_seq->effectdata; - char formatstring[1024]; - strcpy(formatstring, "Transition Type %t|Single Wipe%x0|Double Wipe %x1|Iris Wipe %x4|Clock Wipe %x5"); + char formatstring[256]; + strncpy(formatstring, "Transition Type %t|Single Wipe%x0|Double Wipe %x1|Iris Wipe %x4|Clock Wipe %x5", 255); uiDefButS(block, MENU,SEQ_BUT_EFFECT, formatstring, 10,90,220,22, &wipe->wipetype, 0, 0, 0, 0, "What type of wipe should be performed"); uiDefButF(block, NUM,SEQ_BUT_EFFECT,"Blur:", 10,65,220,22, &wipe->edgeWidth,0.0,1.0, 1, 2, "The percent width of the blur edge"); switch(wipe->wipetype){ /*Skip Types that do not require angle*/ |