add check to buildOptionsJson too

Author: d-a-v

legacy/builder/constants/constants.go

@@ -86,8 +86,9 @@ const MSG_ERROR_ARCHIVING_CORE_CACHE = "Error archiving built core (caching) in
 const MSG_CORE_CACHE_UNAVAILABLE = "Unable to cache built core, please tell {0} maintainers to follow http://goo.gl/QdCUjo"
 const MSG_BOARD_UNKNOWN = "Board {0} (platform {1}, package {2}) is unknown"
 const MSG_BOOTLOADER_FILE_MISSING = "Bootloader file specified but missing: {0}"
-const MSG_BUILD_OPTIONS_CHANGED = "Build options changed, rebuilding all"
-const MSG_BUILD_OPTIONS_INVALID = "{0} invalid, rebuilding all"
+const MSG_REBUILD_ALL = ", rebuilding all"
+const MSG_BUILD_OPTIONS_CHANGED = "Build options changed"
+const MSG_BUILD_OPTIONS_INVALID = "{0} invalid"
 const MSG_CANT_FIND_SKETCH_IN_PATH = "Unable to find {0} in {1}"
 const MSG_FQBN_INVALID = "{0} is not a valid fully qualified board name. Required format is targetPackageName:targetPlatformName:targetBoardName."
 const MSG_FIND_INCLUDES_FAILED = "Error while detecting libraries included by {0}"

legacy/builder/wipeout_build_path_if_build_options_changed.go

@@ -18,7 +18,9 @@ package builder
 import (
 	"encoding/json"
 	"path/filepath"
+	"os"
 
+	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/legacy/builder/builder_utils"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
@@ -40,11 +42,14 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 	previousBuildOptionsJson := ctx.BuildOptionsJsonPrevious
 
 	var opts *properties.Map
-	json.Unmarshal([]byte(buildOptionsJson), &opts)
+	if err := json.Unmarshal([]byte(buildOptionsJson), &opts); err != nil || opts == nil {
+		ctx.GetLogger().Println(constants.LOG_LEVEL_DEBUG, constants.MSG_BUILD_OPTIONS_INVALID, constants.BUILD_OPTIONS_FILE)
+		os.Exit(errorcodes.ErrGeneric)
+	}
 
 	var prevOpts *properties.Map
 	if err := json.Unmarshal([]byte(previousBuildOptionsJson), &prevOpts); err != nil || prevOpts == nil {
-		ctx.GetLogger().Println(constants.LOG_LEVEL_DEBUG, constants.MSG_BUILD_OPTIONS_INVALID, constants.BUILD_OPTIONS_FILE)
+		ctx.GetLogger().Println(constants.LOG_LEVEL_DEBUG, constants.MSG_BUILD_OPTIONS_INVALID + constants.MSG_REBUILD_ALL, constants.BUILD_OPTIONS_FILE)
 		return doCleanup(ctx.BuildPath)
 	}
 
@@ -77,7 +82,7 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 func doCleanup(buildPath *paths.Path) error {
 	// FIXME: this should go outside legacy and behind a `logrus` call so users can
 	// control when this should be printed.
-	// logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED)
+	// logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_BUILD_OPTIONS_CHANGED + MSG_REBUILD_ALL)
 
 	if files, err := buildPath.ReadDir(); err != nil {
 		return errors.WithMessage(err, "cleaning build path")