Mercurial > hg > dmlib

comparison src/dmzlib.c @ 968:b522067e2beb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix error message.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 27 Feb 2015 05:27:43 +0200
parents df8d2ad98f7d
children 14b82bd5a408
comparison
equal deleted inserted replaced
967:b387481e511e 968:b522067e2beb
421 421
422 422
423 static int dmZLibParseUncompresedBlock(DMZLibContext * ctx) 423 static int dmZLibParseUncompresedBlock(DMZLibContext * ctx)
424 { 424 {
425 Uint8 header[4]; 425 Uint8 header[4];
426 int len, nlen, k; 426 int len, nlen, k, ret;
427 427
428 if (ctx->numBits & 7) 428 if (ctx->numBits & 7)
429 dmZReceive(ctx, ctx->numBits & 7); // discard 429 dmZReceive(ctx, ctx->numBits & 7); // discard
430 430
431 // drain the bit-packed data into header 431 // drain the bit-packed data into header
455 { 455 {
456 return dmError(DMERR_BOUNDS, 456 return dmError(DMERR_BOUNDS,
457 "Read past buffer, probably corrupt compressed data.\n"); 457 "Read past buffer, probably corrupt compressed data.\n");
458 } 458 }
459 459
460 if (ctx->zout + len > ctx->zoutEnd && !stbi__zexpand(ctx, ctx->zout, len)) 460 if (ctx->zout + len > ctx->zoutEnd &&
461 (ret = stbi__zexpand(ctx, ctx->zout, len)) != DMERR_OK)
461 { 462 {
462 return dmError(DMERR_DATA_ERROR, 463 return dmError(DMERR_DATA_ERROR,
463 "XXXX TODO"); 464 "Failed to decompress enough data: %d, %s\n",
465 ret, dmErrorStr(ret));
464 } 466 }
465 467
466 memcpy(ctx->zout, ctx->zbuffer, len); 468 memcpy(ctx->zout, ctx->zbuffer, len);
467 ctx->zbuffer += len; 469 ctx->zbuffer += len;
468 ctx->zout += len; 470 ctx->zout += len;