diff options
| author | Werner Lemberg <wl@gnu.org> | 2020-06-19 03:41:12 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-06-19 03:41:12 +0200 |
| commit | 74cebeae1249f8ebade559a7316fe84db7a36fd2 (patch) | |
| tree | e5295971f9ae25cd8da010dedcb2c2cd77013111 | |
| parent | c8cd139c3025f6371974c8aecfe3a393dd5ad994 (diff) | |
| download | freetype2-74cebeae1249f8ebade559a7316fe84db7a36fd2.tar.gz | |
* src/cff/cffload.c (cff_index_get_pointers): Rename `t' to `tbl'.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/cff/cffload.c | 29 |
2 files changed, 20 insertions, 13 deletions
@@ -1,3 +1,7 @@ +2020-06-19 Werner Lemberg <wl@gnu.org> + + * src/cff/cffload.c (cff_index_get_pointers): Rename `t' to `tbl'. + 2020-06-19 Sebastian Rasmussen <sebras@gmail.com> [cff] Free table upon error allocating other data (#58609). diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 13f499269..5386f4902 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -410,7 +410,7 @@ FT_Error error = FT_Err_Ok; FT_Memory memory = idx->stream->memory; - FT_Byte** t = NULL; + FT_Byte** tbl = NULL; FT_Byte* new_bytes = NULL; FT_ULong new_size; @@ -427,11 +427,11 @@ new_size = idx->data_size + idx->count; if ( idx->count > 0 && - !FT_NEW_ARRAY( t, idx->count + 1 ) && + !FT_NEW_ARRAY( tbl, idx->count + 1 ) && ( !pool || !FT_ALLOC( new_bytes, new_size ) ) ) { FT_ULong n, cur_offset; - FT_ULong extra = 0; + FT_ULong extra = 0; FT_Byte* org_bytes = idx->bytes; @@ -448,9 +448,9 @@ } if ( !pool ) - t[0] = org_bytes + cur_offset; + tbl[0] = org_bytes + cur_offset; else - t[0] = new_bytes + cur_offset; + tbl[0] = new_bytes + cur_offset; for ( n = 1; n <= idx->count; n++ ) { @@ -464,23 +464,25 @@ next_offset = idx->data_size; if ( !pool ) - t[n] = org_bytes + next_offset; + tbl[n] = org_bytes + next_offset; else { - t[n] = new_bytes + next_offset + extra; + tbl[n] = new_bytes + next_offset + extra; if ( next_offset != cur_offset ) { - FT_MEM_COPY( t[n - 1], org_bytes + cur_offset, t[n] - t[n - 1] ); - t[n][0] = '\0'; - t[n] += 1; + FT_MEM_COPY( tbl[n - 1], + org_bytes + cur_offset, + tbl[n] - tbl[n - 1] ); + tbl[n][0] = '\0'; + tbl[n] += 1; extra++; } } cur_offset = next_offset; } - *table = t; + *table = tbl; if ( pool ) *pool = new_bytes; @@ -491,8 +493,9 @@ Exit: if ( error && new_bytes ) FT_FREE( new_bytes ); - if ( error && t ) - FT_FREE( t ); + if ( error && tbl ) + FT_FREE( tbl ); + return error; } |