My favorites | Sign in
Project Home Downloads Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 1 attachment: lib3ds_fix_reading_bad_chunks.patch (4.2 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
Index: src/lib3ds.h
===================================================================
--- src/lib3ds.h (revision 104)
+++ src/lib3ds.h (working copy)
@@ -349,7 +349,7 @@
LIB3DS_FACE_WRAP_V = 0x10, /**< Bit 4: Face is at tex V wrap seam */
LIB3DS_FACE_SELECT_3 = (1<<13), /**< Bit 13: Selection of the face in selection 3*/
LIB3DS_FACE_SELECT_2 = (1<<14), /**< Bit 14: Selection of the face in selection 2*/
- LIB3DS_FACE_SELECT_1 = (1<<15), /**< Bit 15: Selection of the face in selection 1*/
+ LIB3DS_FACE_SELECT_1 = (1<<15) /**< Bit 15: Selection of the face in selection 1*/
} Lib3dsFaceFlags;

typedef struct Lib3dsFace {
Index: src/lib3ds_chunk.c
===================================================================
--- src/lib3ds_chunk.c (revision 104)
+++ src/lib3ds_chunk.c (working copy)
@@ -37,6 +37,11 @@
c->cur = lib3ds_io_tell(io);
c->chunk = lib3ds_io_read_word(io);
c->size = lib3ds_io_read_dword(io);
+ /*if (c->size == 0)
+ lib3ds_io_log(io, LIB3DS_LOG_WARN, "Corrupted chunk found (size==0). Data may be invalid.");
+ return 0;
+ }*/
+ assert(c->size != 0);
c->end = c->cur + c->size;
c->cur += 6;
if (c->size < 6) {
@@ -69,13 +74,21 @@
Lib3dsChunk d;

if (c->cur >= c->end) {
- assert(c->cur == c->end);
+ if (c->cur != c->end) {
+ lib3ds_io_log(io, LIB3DS_LOG_WARN, "Corrupted chunk found. Data may be invalid.");
+ lib3ds_io_seek(io, (long)c->end, LIB3DS_SEEK_SET);
+ c->cur = c->end;
+ }
return 0;
}

lib3ds_io_seek(io, (long)c->cur, LIB3DS_SEEK_SET);
d.chunk = lib3ds_io_read_word(io);
d.size = lib3ds_io_read_dword(io);
+ if (d.size == 0) {
+ lib3ds_io_log(io, LIB3DS_LOG_WARN, "Corrupted chunk found (size==0). Data may be invalid.");
+ return 0;
+ }
c->cur += d.size;

if (io->log_func) {
@@ -129,6 +142,11 @@
lib3ds_chunk_write_end(Lib3dsChunk *c, Lib3dsIo *io) {
assert(c);
c->size = lib3ds_io_tell(io) - c->cur;
+ /*if (c->size == 0)
+ lib3ds_io_log(io, LIB3DS_LOG_WARN, "Corrupted chunk found (size==0). Data may be invalid.");
+ return 0;
+ }*/
+ assert(c->size != 0);
lib3ds_io_seek(io, c->cur + 2, LIB3DS_SEEK_SET);
lib3ds_io_write_dword(io, c->size);
c->cur += c->size;
Index: src/lib3ds_io.c
===================================================================
--- src/lib3ds_io.c (revision 104)
+++ src/lib3ds_io.c (working copy)
@@ -144,7 +144,7 @@
uint8_t b;

assert(io);
- lib3ds_io_read(io, &b, 1);
+ if (lib3ds_io_read(io, &b, 1) != 1) lib3ds_io_read_error(io);
return(b);
}

@@ -158,7 +158,7 @@
uint16_t w;

assert(io);
- lib3ds_io_read(io, b, 2);
+ if (lib3ds_io_read(io, b, 2) != 2) lib3ds_io_read_error(io);
w = ((uint16_t)b[1] << 8) |
((uint16_t)b[0]);
return(w);
@@ -174,7 +174,7 @@
uint32_t d;

assert(io);
- lib3ds_io_read(io, b, 4);
+ if (lib3ds_io_read(io, b, 4) != 4) lib3ds_io_read_error(io);
d = ((uint32_t)b[3] << 24) |
((uint32_t)b[2] << 16) |
((uint32_t)b[1] << 8) |
@@ -191,7 +191,7 @@
int8_t b;

assert(io);
- lib3ds_io_read(io, &b, 1);
+ if (lib3ds_io_read(io, &b, 1) != 1) lib3ds_io_read_error(io);
return(b);
}

@@ -205,7 +205,7 @@
uint16_t w;

assert(io);
- lib3ds_io_read(io, b, 2);
+ if (lib3ds_io_read(io, b, 2) != 2) lib3ds_io_read_error(io);
w = ((uint16_t)b[1] << 8) |
((uint16_t)b[0]);
return((int16_t)w);
@@ -221,7 +221,7 @@
uint32_t d;

assert(io);
- lib3ds_io_read(io, b, 4);
+ if (lib3ds_io_read(io, b, 4) != 4) lib3ds_io_read_error(io);
d = ((uint32_t)b[3] << 24) |
((uint32_t)b[2] << 16) |
((uint32_t)b[1] << 8) |
@@ -239,7 +239,7 @@
Lib3dsDwordFloat d;

assert(io);
- lib3ds_io_read(io, b, 4);
+ if (lib3ds_io_read(io, b, 4) != 4) lib3ds_io_read_error(io);
d.dword_value = ((uint32_t)b[3] << 24) |
((uint32_t)b[2] << 16) |
((uint32_t)b[1] << 8) |
Powered by Google Project Hosting