Validate input OID for _cupsSNMPString

zdohnal · zdohnal · commit 66a8e47be288 · 2024-04-26T11:01:18.000+02:00
diff --git a/cups/snmp.c b/cups/snmp.c
@@ -509,13 +509,18 @@ _cupsSNMPStringToOID(const char *src,	/* I - OID string */
        *src && dstptr < dstend;
        src ++)
   {
-    if (*src == '.')
+    if (*src == '.' && src[1])
     {
       dstptr ++;
       *dstptr = 0;
     }
     else if (isdigit(*src & 255))
+    {
+      if ((*dstptr * 10 + *src - '0') > 0xffff)
+        break;
+
       *dstptr = *dstptr * 10 + *src - '0';
+    }
     else
       break;
   }

Original file line number	Diff line number	Diff line change
`@@ -509,13 +509,18 @@ _cupsSNMPStringToOID(const char src, / I - OID string */`
`509`	`509`	`*src && dstptr < dstend;`
`510`	`510`	`src ++)`
`511`	`511`	`{`
`512`		`- if (*src == '.')`
	`512`	`+ if (*src == '.' && src[1])`
`513`	`513`	`{`
`514`	`514`	`dstptr ++;`
`515`	`515`	`*dstptr = 0;`
`516`	`516`	`}`
`517`	`517`	`else if (isdigit(*src & 255))`
	`518`	`+ {`
	`519`	`+ if ((dstptr 10 + *src - '0') > 0xffff)`
	`520`	`+ break;`
	`521`	`+`
`518`	`522`	`dstptr = dstptr * 10 + *src - '0';`
	`523`	`+ }`
`519`	`524`	`else`
`520`	`525`	`break;`
`521`	`526`	`}`