prevent crash from bam files

drwrose · drwrose · commit 9e82e17ae7b9 · 2005-12-22T17:35:37.000Z
diff --git a/panda/src/text/geomTextGlyph.cxx b/panda/src/text/geomTextGlyph.cxx
@@ -39,9 +39,9 @@ GeomTextGlyph(DynamicTextGlyph *glyph, const GeomVertexData *data) :
   // Initially, there is only one glyph in the Geom.  There might be
   // additional Glyphs later when we flatten the graph and call
   // Geom::unify().
-  _glyphs.reserve(1);
-  _glyphs.push_back(glyph);
   if (glyph != (DynamicTextGlyph *)NULL) {
+    _glyphs.reserve(1);
+    _glyphs.push_back(glyph);
     glyph->_geom_count++;
   }
 }
@@ -58,7 +58,9 @@ GeomTextGlyph(const GeomTextGlyph &copy) :
 {
   Glyphs::iterator gi;
   for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
-    (*gi)->_geom_count++;
+    DynamicTextGlyph *glyph = (*gi);
+    nassertv(glyph != (DynamicTextGlyph *)NULL);
+    glyph->_geom_count++;
   }
 }
 
@@ -73,12 +75,16 @@ operator = (const GeomTextGlyph &copy) {
   
   Glyphs::iterator gi;
   for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
-    (*gi)->_geom_count--;
+    DynamicTextGlyph *glyph = (*gi);
+    nassertv(glyph != (DynamicTextGlyph *)NULL);
+    glyph->_geom_count--;
     nassertv((*gi)->_geom_count >= 0);
   }
   _glyphs = copy._glyphs;
   for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
-    (*gi)->_geom_count++;
+    DynamicTextGlyph *glyph = (*gi);
+    nassertv(glyph != (DynamicTextGlyph *)NULL);
+    glyph->_geom_count++;
   }
 }
 
@@ -91,8 +97,10 @@ GeomTextGlyph::
 ~GeomTextGlyph() {
   Glyphs::iterator gi;
   for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
-    (*gi)->_geom_count--;
-    nassertv((*gi)->_geom_count >= 0);
+    DynamicTextGlyph *glyph = (*gi);
+    nassertv(glyph != (DynamicTextGlyph *)NULL);
+    glyph->_geom_count--;
+    nassertv(glyph->_geom_count >= 0);
   }
 }
 
@@ -153,7 +161,9 @@ output(ostream &out) const {
   out << ", glyphs: [";
   Glyphs::const_iterator gi;
   for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
-    out << " " << (*gi)->get_character();
+    DynamicTextGlyph *glyph = (*gi);
+    nassertv(glyph != (DynamicTextGlyph *)NULL);
+    out << " " << glyph->get_character();
   }
   out << " ]";
 }
@@ -170,7 +180,9 @@ write(ostream &out, int indent_level) const {
     << "Glyphs: [";
   Glyphs::const_iterator gi;
   for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
-    out << " " << (*gi)->get_character();
+    DynamicTextGlyph *glyph = (*gi);
+    nassertv(glyph != (DynamicTextGlyph *)NULL);
+    out << " " << glyph->get_character();
   }
   out << " ]\n";
 }

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ GeomTextGlyph(DynamicTextGlyph glyph, const GeomVertexData data) :`
`39`	`39`	`// Initially, there is only one glyph in the Geom. There might be`
`40`	`40`	`// additional Glyphs later when we flatten the graph and call`
`41`	`41`	`// Geom::unify().`
`42`		`- _glyphs.reserve(1);`
`43`		`- _glyphs.push_back(glyph);`
`44`	`42`	`if (glyph != (DynamicTextGlyph *)NULL) {`
	`43`	`+ _glyphs.reserve(1);`
	`44`	`+ _glyphs.push_back(glyph);`
`45`	`45`	`glyph->_geom_count++;`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -58,7 +58,9 @@ GeomTextGlyph(const GeomTextGlyph &copy) :`
`58`	`58`	`{`
`59`	`59`	`Glyphs::iterator gi;`
`60`	`60`	`for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {`
`61`		`- (*gi)->_geom_count++;`
	`61`	`+ DynamicTextGlyph glyph = (gi);`
	`62`	`+ nassertv(glyph != (DynamicTextGlyph *)NULL);`
	`63`	`+ glyph->_geom_count++;`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`
`@@ -73,12 +75,16 @@ operator = (const GeomTextGlyph &copy) {`
`73`	`75`
`74`	`76`	`Glyphs::iterator gi;`
`75`	`77`	`for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {`
`76`		`- (*gi)->_geom_count--;`
	`78`	`+ DynamicTextGlyph glyph = (gi);`
	`79`	`+ nassertv(glyph != (DynamicTextGlyph *)NULL);`
	`80`	`+ glyph->_geom_count--;`
`77`	`81`	`nassertv((*gi)->_geom_count >= 0);`
`78`	`82`	`}`
`79`	`83`	`_glyphs = copy._glyphs;`
`80`	`84`	`for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {`
`81`		`- (*gi)->_geom_count++;`
	`85`	`+ DynamicTextGlyph glyph = (gi);`
	`86`	`+ nassertv(glyph != (DynamicTextGlyph *)NULL);`
	`87`	`+ glyph->_geom_count++;`
`82`	`88`	`}`
`83`	`89`	`}`
`84`	`90`
`@@ -91,8 +97,10 @@ GeomTextGlyph::`
`91`	`97`	`~GeomTextGlyph() {`
`92`	`98`	`Glyphs::iterator gi;`
`93`	`99`	`for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {`
`94`		`- (*gi)->_geom_count--;`
`95`		`- nassertv((*gi)->_geom_count >= 0);`
	`100`	`+ DynamicTextGlyph glyph = (gi);`
	`101`	`+ nassertv(glyph != (DynamicTextGlyph *)NULL);`
	`102`	`+ glyph->_geom_count--;`
	`103`	`+ nassertv(glyph->_geom_count >= 0);`
`96`	`104`	`}`
`97`	`105`	`}`
`98`	`106`
`@@ -153,7 +161,9 @@ output(ostream &out) const {`
`153`	`161`	`out << ", glyphs: [";`
`154`	`162`	`Glyphs::const_iterator gi;`
`155`	`163`	`for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {`
`156`		`- out << " " << (*gi)->get_character();`
	`164`	`+ DynamicTextGlyph glyph = (gi);`
	`165`	`+ nassertv(glyph != (DynamicTextGlyph *)NULL);`
	`166`	`+ out << " " << glyph->get_character();`
`157`	`167`	`}`
`158`	`168`	`out << " ]";`
`159`	`169`	`}`
`@@ -170,7 +180,9 @@ write(ostream &out, int indent_level) const {`
`170`	`180`	`<< "Glyphs: [";`
`171`	`181`	`Glyphs::const_iterator gi;`
`172`	`182`	`for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {`
`173`		`- out << " " << (*gi)->get_character();`
	`183`	`+ DynamicTextGlyph glyph = (gi);`
	`184`	`+ nassertv(glyph != (DynamicTextGlyph *)NULL);`
	`185`	`+ out << " " << glyph->get_character();`
`174`	`186`	`}`
`175`	`187`	`out << " ]\n";`
`176`	`188`	`}`