diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-01 16:48:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-01 16:48:41 +0400 |
| commit | ffec71db8490cfc5789781de8da87229b130b260 (patch) | |
| tree | 057d2c391c635c56109dbce40dbb1e7f64328517 /source/blender/blenkernel | |
| parent | 6c83806a00cf1bf518196c9f35a2acc6535813e1 (diff) | |
Fix issues reported by coverity scan in recent changes to customdata code.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 11 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 1521ec8467e..13d8c0380ab 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1463,8 +1463,7 @@ int CustomData_get_named_layer_index(const CustomData *data, int type, const cha for (i = 0; i < data->totlayer; ++i) if (data->layers[i].type == type) - if ((!name && !data->layers[i].name) || - (strcmp(data->layers[i].name, name) == 0)) + if (strcmp(data->layers[i].name, name) == 0) return i; return -1; @@ -1970,11 +1969,9 @@ static void CustomData_copy_data_layer(const CustomData *source, CustomData *des dest_offset = dest_index * typeInfo->size; if (!src_data || !dest_data) { - if (src_data != NULL && dest_data != NULL) { - printf("%s: warning null data for %s type (%p --> %p), skipping\n", - __func__, layerType_getName(source->layers[src_i].type), - (void *)src_data, (void *)dest_data); - } + printf("%s: warning null data for %s type (%p --> %p), skipping\n", + __func__, layerType_getName(source->layers[src_i].type), + (void *)src_data, (void *)dest_data); return; } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 56e6e237d57..a77f768835a 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -645,7 +645,7 @@ bool BKE_mesh_uv_cdlayer_rename_index(Mesh *me, const int poly_index, const int } cdlp = &pdata->layers[poly_index]; cdlu = &ldata->layers[loop_index]; - cdlf = do_tessface ? &fdata->layers[face_index] : NULL; + cdlf = fdata && do_tessface ? &fdata->layers[face_index] : NULL; BLI_strncpy(cdlp->name, new_name, sizeof(cdlp->name)); CustomData_set_layer_unique_name(pdata, cdlp - pdata->layers); @@ -662,8 +662,10 @@ bool BKE_mesh_uv_cdlayer_rename_index(Mesh *me, const int poly_index, const int CustomData_set_layer_unique_name(ldata, cdlu - ldata->layers); break; case 2: - BLI_strncpy(cdlf->name, cdlp->name, sizeof(cdlf->name)); - CustomData_set_layer_unique_name(fdata, cdlf - fdata->layers); + if (cdlf) { + BLI_strncpy(cdlf->name, cdlp->name, sizeof(cdlf->name)); + CustomData_set_layer_unique_name(fdata, cdlf - fdata->layers); + } break; } } |