Detect encoded character entities in properties

Author: cpiker

das2/descriptor.c

@@ -981,7 +981,8 @@ DasErrCode _DasDesc_encode(
 				DasBuf_puts(pBuf, DasProp_xmlValue(pProp, sDynaBuf, uEscapeSz));
 				free(sDynaBuf);
 			}
-			else{	
+			else{
+				memset(sStaticBuf, 0, _STACK_BUF_LEN);
 				DasBuf_puts(pBuf, DasProp_xmlValue(pProp, sStaticBuf, _STACK_BUF_LEN-1));
 			}
 		}

das2/property.c

@@ -324,18 +324,44 @@ const char* DasProp_value(const DasProp* pProp)
 	return sBuf + uOffset;
 }
 
+/* TODO: Add a unittest for this thing, it need's it */
 size_t DasProp_escapeSize(const DasProp* pProp)
 {
 	size_t uEscapeSz = 0;
 
 	bool bNeedXlate = false;
 	const char* p = DasProp_value(pProp);
 
+	static const char* entities[] = {"lt;", "gt;", "quot;", "apos;", "amp;"};
+	size_t uEntLen = 0;
+	bool bEnt = false;
+	int i = 0;
+
 	while(*p != '\0'){
-		if((*p == '"')||(*p == '\'')||(*p == '<')||(*p == '>')||(*p == '&')){
+		if((*p == '"')||(*p == '\'')||(*p == '<')||(*p == '>')){
 			bNeedXlate = true;
 			uEscapeSz += 6;
 		}
+		else if(*p == '&'){
+			/* This one is a pain, because the text may *already* be escaped
+			   and this is the start of a character entity (yay) 
+				
+				All the strlen checks etc. could be avoided below with extra
+				loop state combined with a small lookup table on the stack
+				but this will do for now.
+			*/
+			bEnt = false;
+			for(i = 0; i < 5; ++i){
+				uEntLen = strlen(entities[i]);
+				if(strncmp(p+1, entities[i], uEntLen) == 0){
+					p += (uEntLen + 1);
+					uEscapeSz += (uEntLen + 1);
+					bEnt = true;
+					break;
+				}
+			}
+			bNeedXlate = ! bEnt;
+		}
 		else{
 			uEscapeSz += 1;
 		}

das2/vector.c

@@ -117,7 +117,7 @@ const char* das_compsys_desc(ubyte uST)
 	       "if missing.";
 	case DAS_VSYS_SPH:
 	return "An ISO 31-11 standard spherical system. The full component set "
-	       "is (r,θ,φ) where r is the radial diretion, θ is the colatitude "
+	       "is (r,θ,φ) where r is the radial direction, θ is the colatitude "
 	       "(which is 0° at the north pole) and φ is the eastward angle. "
 	       "Both θ, φ are assumed to be 0° if missing and r is assumed to "
 	       "be 1 if missing.";