Mercurial > hg > dmlib

comparison src/dmpack.c @ 2479:c1cae47cd410

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename DMPackEntry::length to csize (compressed size).
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 27 Apr 2020 21:33:29 +0300
parents 69a5af2eb1ea
children 9807ae37ad69
comparison
equal deleted inserted replaced
2478:0d13de7edb30 2479:c1cae47cd410
148 goto out; 148 goto out;
149 } 149 }
150 150
151 if (!dm_fread_str(pack->file, (Uint8 *) &entry->filename, DMRES_NAME_LEN) || 151 if (!dm_fread_str(pack->file, (Uint8 *) &entry->filename, DMRES_NAME_LEN) ||
152 !dm_fread_le64(pack->file, &entry->offset) || 152 !dm_fread_le64(pack->file, &entry->offset) ||
153 !dm_fread_le32(pack->file, &entry->length) || 153 !dm_fread_le32(pack->file, &entry->csize) ||
154 !dm_fread_le32(pack->file, &entry->size) || 154 !dm_fread_le32(pack->file, &entry->size) ||
155 !dm_fread_le32(pack->file, &entry->flags)) 155 !dm_fread_le32(pack->file, &entry->flags))
156 { 156 {
157 ret = DMERR_FREAD; 157 ret = DMERR_FREAD;
158 goto out; 158 goto out;
160 160
161 // Ensure that the filename ends in NUL 161 // Ensure that the filename ends in NUL
162 entry->filename[DMRES_NAME_LEN] = 0; 162 entry->filename[DMRES_NAME_LEN] = 0;
163 163
164 // Validate 164 // Validate
165 if (entry->size == 0 || entry->length == 0 || 165 if (entry->size == 0 || entry->csize == 0 ||
166 entry->length > hdr.dirOffset || 166 entry->csize > hdr.dirOffset ||
167 entry->offset > hdr.dirOffset || 167 entry->offset > hdr.dirOffset ||
168 strlen(entry->filename) == 0) 168 strlen(entry->filename) == 0)
169 { 169 {
170 ret = dmErrorDBG(DMERR_INVALID, 170 ret = dmErrorDBG(DMERR_INVALID,
171 "Invalid PACK entry #%d '%s'\n", i, 171 "Invalid PACK entry #%d '%s'\n", i,