CMD: add size-origin to patch records

Author: sipma

chb/ast/ASTCPrettyPrinter.py

@@ -497,6 +497,7 @@ def visit_memref(self, memref: AST.ASTMemRef) -> None:
         if memref.memexp.is_ast_addressof:
             memexpa = cast(AST.ASTAddressOf, memref.memexp)
             memexpa.lval.accept(self)
+            '''
         elif memref.memexp.is_ast_binary_op:
             memexpb = cast(AST.ASTBinaryOp, memref.memexp)
             exp1 = memexpb.exp1
@@ -510,6 +511,7 @@ def visit_memref(self, memref: AST.ASTMemRef) -> None:
                 self.ccode.write("(*(")
                 memref.memexp.accept(self)
                 self.ccode.write("))")
+            '''
         else:
             self.ccode.write("(*(")
             memref.memexp.accept(self)

chb/buffer/LibraryCallCallsites.py

@@ -236,6 +236,7 @@ def lentype(self) -> str:
     def to_json_result(self,
                        dstoffset: int,
                        buffersize: int,
+                       sizeorigin: str,
                        spare: Optional[str],
                       ) -> JSONResult:
         if self.dstarg is None:
@@ -248,6 +249,7 @@ def to_json_result(self,
         content["faddr"] = self.faddr
         content["iaddr"] = self.instr.iaddr
         content["buffersize"] = buffersize
+        content["size-origin"] = sizeorigin
         content["target-function"] = self.summary.name
         content["stack-offset"] = dstoffset
         if self.lenarg is not None:

chb/cmdline/reportcmds.py

@@ -1324,11 +1324,14 @@ def include_target(target: 'CallTarget') -> bool:
                     "Stackbuffer for %s at offset %s does not have a size, but stackframe "
                     + " allows a buffer of %s",
                     str(instr), str(dstoffset), str(buffersize))
+                sizeorigin = "stackframe-layout"
+        else:
+            sizeorigin = "stackslot-access"
 
         basicblock = fn.block(pc.baddr)
         spare = find_spare_instruction(basicblock, instr.iaddr)
 
-        jresult = pc.to_json_result(dstoffset, buffersize, spare)
+        jresult = pc.to_json_result(dstoffset, buffersize, sizeorigin, spare)
         if not jresult.is_ok:
             chklogger.logger.warning("Couldn't process patch callsite %s", pc)
             continue
@@ -1352,6 +1355,7 @@ def include_target(target: 'CallTarget') -> bool:
         print("  - stack offset: %s" % patch_record['stack-offset'])
         print("  - length argument: %s" % patch_record['length-argument'])
         print("  - buffersize: %s" % patch_record['buffersize'])
+        print("  - size-origin: %s" % patch_record['size-origin'])
         print("  - spare: %s" % patch_record['spare'])
         print("")