diff options
author | tpaviot <tpaviot@gmail.com> | 2012-02-02 06:16:46 +0100 |
---|---|---|
committer | tpaviot <tpaviot@gmail.com> | 2012-02-02 06:43:08 +0100 |
commit | 0b844723c191f16a54e1143188a4708877472632 (patch) | |
tree | f762d0343994e8f4e3f746cb26615c727f1c0338 | |
parent | ce12274b446fad04f4f9d3f1ef2f42eccf896031 (diff) | |
download | oce-0b844723c191f16a54e1143188a4708877472632.tar.gz oce-0b844723c191f16a54e1143188a4708877472632.zip |
Fix issue #246: add missing bracket to if clause
-rw-r--r-- | src/OSD/OSD_FontMgr.cxx | 2 | ||||
-rw-r--r-- | src/OpenGl/OpenGl_ImageBox.cxx | 2 | ||||
-rw-r--r-- | src/OpenGl/OpenGl_filters.cxx | 2 | ||||
-rw-r--r-- | src/OpenGl/OpenGl_text.cxx | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/src/OSD/OSD_FontMgr.cxx b/src/OSD/OSD_FontMgr.cxx index 231f6c50..047d0616 100644 --- a/src/OSD/OSD_FontMgr.cxx +++ b/src/OSD/OSD_FontMgr.cxx @@ -165,9 +165,11 @@ void OSD_FontMgr::InitFontDataBase() { Standard_Character *font_dir = new Standard_Character[ req_size + strlen("\\Fonts\\") + 1 ] ; if( !strcpy( font_dir, windir_var ) ) + { delete [] windir_var; delete [] font_dir; return ; + } if( !strcat( font_dir, "\\Fonts\\" ) ) return ; diff --git a/src/OpenGl/OpenGl_ImageBox.cxx b/src/OpenGl/OpenGl_ImageBox.cxx index 8d1b8888..ae30bd9a 100644 --- a/src/OpenGl/OpenGl_ImageBox.cxx +++ b/src/OpenGl/OpenGl_ImageBox.cxx @@ -326,12 +326,14 @@ read_texture(char *name, int *width, int *height, int *components) { bbuf = (unsigned char *)malloc(image->xsize*sizeof(unsigned char)); abuf = (unsigned char *)malloc(image->xsize*sizeof(unsigned char)); if(!base || !rbuf || !gbuf || !bbuf) + { free(base); free(rbuf); free(gbuf); free(bbuf); free(abuf); return NULL; + } lptr = base; for(y=0; y<image->ysize; y++) { if(image->zsize>=4) { diff --git a/src/OpenGl/OpenGl_filters.cxx b/src/OpenGl/OpenGl_filters.cxx index dcd01e9a..4b4fdbe7 100644 --- a/src/OpenGl/OpenGl_filters.cxx +++ b/src/OpenGl/OpenGl_filters.cxx @@ -348,9 +348,11 @@ TglNamesetRemove( Tint num, Tint *set ) size = num, size %= LIST_GROW_SIZE, size++, size *= LIST_GROW_SIZE; temp = new Tint[size]; if( !temp ) + { delete [] ptr; delete [] temp; return TFailure; + } memcpy( temp, set, num*sizeof(Tint) ); /* sort new set */ diff --git a/src/OpenGl/OpenGl_text.cxx b/src/OpenGl/OpenGl_text.cxx index 4bc32e7f..1018c336 100644 --- a/src/OpenGl/OpenGl_text.cxx +++ b/src/OpenGl/OpenGl_text.cxx @@ -153,10 +153,11 @@ TextAdd( TSM_ELEM_DATA d, Tint n, cmn_key *k ) wchar_t *wstr = new wchar_t[i]; if( !wstr ) + { delete data; delete [] wstr; return TFailure; - + } data->attach_pt = *pt; data->length = i; //szv: instead of memcpy |