replace fixed sizes with sizeof when passing string length since size wasn't always...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jan 2012 13:16:30 +0000 (13:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jan 2012 13:16:30 +0000 (13:16 +0000)
13 files changed:
source/blender/blenkernel/intern/writeframeserver.c
source/blender/blenlib/intern/fileops.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/render/render_preview.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/imbuf/intern/indexer.c
source/blender/windowmanager/intern/wm_operators.c

index ae65b913283adcaae41a6942ff24ccaab2ce7bf5..df908aaa00617f87cef5dd72dddc38f305268962 100644 (file)
@@ -310,7 +310,7 @@ int frameserver_loop(RenderData *rd, ReportList *UNUSED(reports))
                }
        }
 
-       len = recv(connsock, buf, 4095, 0);
+       len = recv(connsock, buf, sizeof(buf) - 1, 0);
 
        if (len < 0) {
                return -1;
index 95b6a970b49e3318165d86420d0c5bce1524b8f1..ad0478060f2837562d69a616fcebfa6e0eeb61d7 100644 (file)
@@ -82,7 +82,7 @@ int BLI_file_gzip(const char *from, const char *to)
                return -2;
 
        while(1) {
-               readsize = read(file, buffer, 10240);
+               readsize = read(file, buffer, sizeof(buffer));
 
                if(readsize < 0) {
                        rval= -2; /* error happened in reading */
index 239dae7d23664841102ece4575d9c66c367bcdb0..7ff69277843052e3473a55777115442d4645f1b7 100644 (file)
@@ -831,7 +831,9 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
                if(but->optype) {
                        IDProperty *prop= (but->opptr)? but->opptr->data: NULL;
 
-                       if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE, buf, sizeof(buf))) {
+                       if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE,
+                                                       buf, sizeof(buf)))
+                       {
                                UI_MENU_KEY_STR_CAT
                        }
                }
@@ -846,7 +848,9 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
 
                        IDP_AssignString(prop_menu_name, mt->idname, sizeof(mt->idname));
 
-                       if(WM_key_event_operator_string(C, "WM_OT_call_menu", WM_OP_INVOKE_REGION_WIN, prop_menu, FALSE, buf, sizeof(buf))) {
+                       if(WM_key_event_operator_string(C, "WM_OT_call_menu", WM_OP_INVOKE_REGION_WIN, prop_menu, FALSE,
+                                                       buf, sizeof(buf)))
+                       {
                                UI_MENU_KEY_STR_CAT
                        }
                }
index 525b15ac7e33cb98eab01db18d0ccbae88c56f26..3a19bb2a90cde4ae22d1150e1ce65270bfe274b8 100644 (file)
@@ -4388,7 +4388,9 @@ static void but_shortcut_name_func(bContext *C, void *arg1, int UNUSED(event))
                IDProperty *prop= (but->opptr)? but->opptr->data: NULL;
                
                /* complex code to change name of button */
-               if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE, buf, sizeof(buf))) {
+               if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE,
+                                               buf, sizeof(buf)))
+               {
                        char *butstr_orig;
 
                        // XXX but->str changed... should not, remove the hotkey from it
index 973b43fca78eb449d2de7d572bdcf46782552fa8..0c5aed83c1bb8678dbd68b3947ef20db45018e07 100644 (file)
@@ -409,7 +409,9 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                /* operator keymap (not menus, they already have it) */
                prop= (but->opptr)? but->opptr->data: NULL;
 
-               if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE, buf, sizeof(buf))) {
+               if(WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE,
+                                               buf, sizeof(buf)))
+               {
                        BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Shortcut: %s"), buf);
                        data->color[data->totline]= 0x888888;
                        data->totline++;
index 379a253a5c9af2cda3464ce75f11571db61f2f6c..96d2077b9b47c80a068a42bbf7f88a51f39019da 100644 (file)
@@ -181,7 +181,7 @@ static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem)
                /* fake button, it holds space for search items */
                uiDefBut(block, LABEL, 0, "", 10, 15, w, h, NULL, 0, 0, 0, 0, NULL);
                
-               but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, 256, 10, 0, w, 19, template.prv_rows, template.prv_cols, "");
+               but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0, w, 19, template.prv_rows, template.prv_cols, "");
                uiButSetSearchFunc(but, id_search_cb, &template, id_search_call_cb, idptr.data);
        }
        /* list view */
@@ -189,7 +189,7 @@ static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem)
                /* fake button, it holds space for search items */
                uiDefBut(block, LABEL, 0, "", 10, 15, 150, uiSearchBoxhHeight(), NULL, 0, 0, 0, 0, NULL);
                
-               but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, 256, 10, 0, 150, 19, 0, 0, "");
+               but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0, 150, 19, 0, 0, "");
                uiButSetSearchFunc(but, id_search_cb, &template, id_search_call_cb, idptr.data);
        }
                
index 0bb5dbef0ea32e36963946ebe6c66d7f02c97d25..d652d2c0e5cc18bfd7ee27135083ecf122a06739 100644 (file)
@@ -884,7 +884,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
        if(getenv(strEnvName)) {
                int dlevel = atoi(getenv(strEnvName));
                elbeemSetDebugLevel(dlevel);
-               BLI_snprintf(debugStrBuffer,256,"fluidsimBake::msg: Debug messages activated due to envvar '%s'\n",strEnvName); 
+               BLI_snprintf(debugStrBuffer, sizeof(debugStrBuffer),"fluidsimBake::msg: Debug messages activated due to envvar '%s'\n",strEnvName);
                elbeemDebugOut(debugStrBuffer);
        }
        
@@ -921,7 +921,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
        
        /* rough check of settings... */
        if(domainSettings->previewresxyz > domainSettings->resolutionxyz) {
-               BLI_snprintf(debugStrBuffer,256,"fluidsimBake::warning - Preview (%d) >= Resolution (%d)... setting equal.\n", domainSettings->previewresxyz ,  domainSettings->resolutionxyz); 
+               BLI_snprintf(debugStrBuffer,sizeof(debugStrBuffer),"fluidsimBake::warning - Preview (%d) >= Resolution (%d)... setting equal.\n", domainSettings->previewresxyz ,  domainSettings->resolutionxyz);
                elbeemDebugOut(debugStrBuffer);
                domainSettings->previewresxyz = domainSettings->resolutionxyz;
        }
@@ -941,7 +941,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
        } else {
                gridlevels = domainSettings->maxRefine;
        }
-       BLI_snprintf(debugStrBuffer,256,"fluidsimBake::msg: Baking %s, refine: %d\n", fsDomain->id.name , gridlevels ); 
+       BLI_snprintf(debugStrBuffer,sizeof(debugStrBuffer),"fluidsimBake::msg: Baking %s, refine: %d\n", fsDomain->id.name , gridlevels );
        elbeemDebugOut(debugStrBuffer);
        
        
@@ -993,7 +993,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
        /* ******** init domain object's matrix ******** */
        copy_m4_m4(domainMat, fsDomain->obmat);
        if(!invert_m4_m4(invDomMat, domainMat)) {
-               BLI_snprintf(debugStrBuffer,256,"fluidsimBake::error - Invalid obj matrix?\n"); 
+               BLI_snprintf(debugStrBuffer,sizeof(debugStrBuffer),"fluidsimBake::error - Invalid obj matrix?\n");
                elbeemDebugOut(debugStrBuffer);
                BKE_report(reports, RPT_ERROR, "Invalid object matrix"); 
 
index 86328ca2a6406d54ba7225da3b0e533fd10701b4..3e34a55a3d93791a8878917b12d6d68611ea0d99 100644 (file)
@@ -104,7 +104,7 @@ ImBuf* get_brush_icon(Brush *brush)
 {
        static const int flags = IB_rect|IB_multilayer|IB_metadata;
 
-       char path[240];
+       char path[FILE_MAX];
        char *folder;
 
        if (!(brush->icon_imbuf)) {
index 71cb83ad23149bbbd8cb70b458b24605f9fec563..f8abfb6f4c3c040c39df5de4b66ebeeb76fcda61 100644 (file)
@@ -628,7 +628,7 @@ static uiBlock *operator_search_menu(bContext *C, ARegion *ar, void *arg_kmi)
        /* fake button, it holds space for search items */
        uiDefBut(block, LABEL, 0, "", 10, 15, 150, uiSearchBoxhHeight(), NULL, 0, 0, 0, 0, NULL);
        
-       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, 256, 10, 0, 150, UI_UNIT_Y, 0, 0, "");
+       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0, 150, UI_UNIT_Y, 0, 0, "");
        uiButSetSearchFunc(but, operator_search_cb, arg_kmi, operator_call_cb, ot);
        
        uiBoundsBlock(block, 6);
index 3353030e29fb9c6cdffe50553517a6f87c753d33..985d70d21446579a1341c4ef80f27363987d203f 100644 (file)
@@ -188,7 +188,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
                                dg = BLI_findlink (&ob->defbase, dvert->dw[i].def_nr);
                                if(dg) {
                                        max+= BLI_snprintf(str, sizeof(str), "%s %%x%d|", dg->name, dvert->dw[i].def_nr); 
-                                       if(max<320) strcat(defstr, str);
+                                       if (max < sizeof(str)) strcat(defstr, str);
                                }
 
                                if(tfp->curdef==dvert->dw[i].def_nr) {
index 49b1b3f723ef39c2fedf66973e0b49577cb3775d..0705d066f26a24e4c14a4883382d30b054607807 100644 (file)
@@ -177,7 +177,7 @@ static uiBlock *tool_search_menu(bContext *C, ARegion *ar, void *arg_listbase)
        /* fake button, it holds space for search items */
        uiDefBut(block, LABEL, 0, "", 10, 15, 150, uiSearchBoxhHeight(), NULL, 0, 0, 0, 0, NULL);
        
-       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, OP_MAX_TYPENAME, 10, 0, 150, 19, 0, 0, "");
+       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 0, 150, 19, 0, 0, "");
        uiButSetSearchFunc(but, operator_search_cb, arg_listbase, operator_call_cb, NULL);
        
        uiBoundsBlock(block, 6);
index ce14951b5fb6bc027c9d1a34df0f48d920ef99f1..e1481d2a08feb37fc49c5809b28916a804a733f6 100644 (file)
@@ -386,12 +386,12 @@ static void get_proxy_filename(struct anim * anim, IMB_Proxy_Size preview_size,
        stream_suffix[0] = 0;
 
        if (anim->streamindex > 0) {
-               BLI_snprintf(stream_suffix, 20, "_st%d", anim->streamindex);
+               BLI_snprintf(stream_suffix, sizeof(stream_suffix), "_st%d", anim->streamindex);
        }
 
-       BLI_snprintf(proxy_name, 256, "proxy_%d%s.avi", 
+       BLI_snprintf(proxy_name, sizeof(proxy_name), "proxy_%d%s.avi",
                     (int) (proxy_fac[i] * 100), stream_suffix);
-       BLI_snprintf(proxy_temp_name, 256, "proxy_%d%s_part.avi", 
+       BLI_snprintf(proxy_temp_name, sizeof(proxy_temp_name), "proxy_%d%s_part.avi",
                     (int) (proxy_fac[i] * 100), stream_suffix);
 
        get_index_dir(anim, index_dir);
index f9a6f0fece345e9db8a11d421f1de311bd48c6bf..123d58073259117c4f00bf83256ae679faa058a2 100644 (file)
@@ -766,7 +766,7 @@ static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg_op)
        uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_RET_1|UI_BLOCK_MOVEMOUSE_QUIT);
 
        //uiDefBut(block, LABEL, 0, op->type->name, 10, 10, 180, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); // ok, this isnt so easy...
-       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, 256, 10, 10, 9*UI_UNIT_X, UI_UNIT_Y, 0, 0, "");
+       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, 9*UI_UNIT_X, UI_UNIT_Y, 0, 0, "");
        uiButSetSearchFunc(but, operator_enum_search_cb, op->type, operator_enum_call_cb, NULL);
 
        /* fake button, it holds space for search items */
@@ -1397,12 +1397,15 @@ static void operator_search_cb(const struct bContext *C, void *UNUSED(arg), cons
                                int len= strlen(ot->name);
                                
                                /* display name for menu, can hold hotkey */
-                               BLI_strncpy(name, ot->name, 256);
+                               BLI_strncpy(name, ot->name, sizeof(name));
                                
                                /* check for hotkey */
-                               if(len < 256-6) {
-                                       if(WM_key_event_operator_string(C, ot->idname, WM_OP_EXEC_DEFAULT, NULL, TRUE, &name[len+1], 256-len-1))
+                               if (len < sizeof(name) - 6) {
+                                       if (WM_key_event_operator_string(C, ot->idname, WM_OP_EXEC_DEFAULT, NULL, TRUE,
+                                                                       &name[len+1], sizeof(name)-len-1))
+                                       {
                                                name[len]= '|';
+                                       }
                                }
                                
                                if(0==uiSearchItemAdd(items, name, ot, 0))
@@ -1424,7 +1427,7 @@ static uiBlock *wm_block_search_menu(bContext *C, ARegion *ar, void *UNUSED(arg_
        block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
        uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_RET_1|UI_BLOCK_MOVEMOUSE_QUIT);
        
-       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, 256, 10, 10, 9*UI_UNIT_X, UI_UNIT_Y, 0, 0, "");
+       but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, 9*UI_UNIT_X, UI_UNIT_Y, 0, 0, "");
        uiButSetSearchFunc(but, operator_search_cb, NULL, operator_call_cb, NULL);
        
        /* fake button, it holds space for search items */