From 61c63be08e6a9c50b3cc14b65877ae8640f7af71 Mon Sep 17 00:00:00 2001 From: Brian Mirletz Date: Mon, 15 Apr 2024 16:05:48 -0600 Subject: [PATCH 1/2] Add json to list of definitely text files --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 2790a981c..d7587b5c7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -28,6 +28,7 @@ build_*/* linguist_generated=true *.h text *.csv text *.lk text +*.json text # Ensure those won't be messed up with *.jpg binary From 1ea78b86909c7d6c8b8c7393932342647507a610 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Fri, 19 Apr 2024 14:28:55 -0600 Subject: [PATCH 2/2] fix #1157 (#1158) --- ssc/vartab.h | 1 + 1 file changed, 1 insertion(+) diff --git a/ssc/vartab.h b/ssc/vartab.h index b428cb2d5..cec037993 100644 --- a/ssc/vartab.h +++ b/ssc/vartab.h @@ -144,6 +144,7 @@ class var_data var_data &operator=(const var_data &rhs) { copy(rhs); return *this; } void copy( const var_data &rhs ) { + clear(); type=rhs.type; num=rhs.num; str=rhs.str;