|
 |
83bc7c |
--- libwmf-0.2.8.4/src/player/meta.h
|
|
|
83bc7c |
+++ libwmf-0.2.8.4/src/player/meta.h
|
|
|
83bc7c |
@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
|
|
|
83bc7c |
objects = P->objects;
|
|
|
83bc7c |
|
|
|
83bc7c |
i = 0;
|
|
|
83bc7c |
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
|
|
|
83bc7c |
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
|
|
|
83bc7c |
|
|
|
83bc7c |
if (i == NUM_OBJECTS (API))
|
|
|
83bc7c |
{ WMF_ERROR (API,"Object out of range!");
|
|
|
83bc7c |
@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
|
|
|
83bc7c |
objects = P->objects;
|
|
|
83bc7c |
|
|
|
83bc7c |
i = 0;
|
|
|
83bc7c |
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
|
|
|
83bc7c |
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
|
|
|
83bc7c |
|
|
|
83bc7c |
if (i == NUM_OBJECTS (API))
|
|
|
83bc7c |
{ WMF_ERROR (API,"Object out of range!");
|
|
|
83bc7c |
@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API,
|
|
|
83bc7c |
objects = P->objects;
|
|
|
83bc7c |
|
|
|
83bc7c |
i = 0;
|
|
|
83bc7c |
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
|
|
|
83bc7c |
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
|
|
|
83bc7c |
|
|
|
83bc7c |
if (i == NUM_OBJECTS (API))
|
|
|
83bc7c |
{ WMF_ERROR (API,"Object out of range!");
|
|
|
83bc7c |
@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP
|
|
|
83bc7c |
objects = P->objects;
|
|
|
83bc7c |
|
|
|
83bc7c |
i = 0;
|
|
|
83bc7c |
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
|
|
|
83bc7c |
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
|
|
|
83bc7c |
|
|
|
83bc7c |
if (i == NUM_OBJECTS (API))
|
|
|
83bc7c |
{ WMF_ERROR (API,"Object out of range!");
|
|
|
83bc7c |
@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API
|
|
|
83bc7c |
objects = P->objects;
|
|
|
83bc7c |
|
|
|
83bc7c |
i = 0;
|
|
|
83bc7c |
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
|
|
|
83bc7c |
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
|
|
|
83bc7c |
|
|
|
83bc7c |
if (i == NUM_OBJECTS (API))
|
|
|
83bc7c |
{ WMF_ERROR (API,"Object out of range!");
|
|
|
83bc7c |
@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI*
|
|
|
83bc7c |
objects = P->objects;
|
|
|
83bc7c |
|
|
|
83bc7c |
i = 0;
|
|
|
83bc7c |
- while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
|
|
|
83bc7c |
+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
|
|
|
83bc7c |
|
|
|
83bc7c |
if (i == NUM_OBJECTS (API))
|
|
|
83bc7c |
{ WMF_ERROR (API,"Object out of range!");
|