fixed pointer handling in StrAgg unpacking

LLNL · Sep 7, 2016 · e3acc5d · e3acc5d
1 parent 80937b9
commit e3acc5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/dysect/DysectAPI/Aggregates/StrAgg.C b/src/dysect/DysectAPI/Aggregates/StrAgg.C
@@ -107,11 +107,12 @@ std::map<string, int>& StrAgg::getCountMap() {
 bool StrAgg::deserialize(void* payload) {
   // Deserialize
   int num = *(int*)payload; // First bytes are for number of functions in payload
+  int ss = sizeof(int);
 
   //printf(">>> num %d\n", num);
 
   // Compute offsets
-  int *counts = (int*)((int*)payload + sizeof(int));
+  int *counts = (int*)((int*)payload + 1);
   char* strs = (char*)((char*)payload + sizeof(int) + (num * sizeof(int)));
 
   char *ptr = strs;
@@ -264,7 +265,6 @@ bool StrAgg::getStr(string& str) {
       string name = countMapIter->first;
 
       sprintf((char*)&buf, "%d:%s ", count, name.c_str());
-
       str.append(buf);
     }
 

diff --git a/src/dysect/libDysectAPI/include/DysectAPI/Err.h b/src/dysect/libDysectAPI/include/DysectAPI/Err.h
@@ -22,6 +22,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
+#include "LibDysectAPI.h"
 
 #define DYSECTVERBOSE(...) Err::verbose(__LINE__, __FILE__, __VA_ARGS__)
 #define DYSECTLOG(...) Err::log(__LINE__, __FILE__, __VA_ARGS__)