GitLab

at 2024-04-28T12:05:17-07:00

Abort if make_var cannot allocate memory with malloc

There are two calls to malloc in this function.  Previously, just the
first checked for an error.  This change adds a similar check to the
second call.

 +((nil
 +  (indent-tabs-mode . t)
 +  (require-final-newline . t)
 +  (tab-width . 8))
 + (c-mode
 +  (c-basic-offset . 4)))

@@ -10,6 +10,7 @@ stages:
    - test
    - ansi-test
    - benchmark
 +  - analyze
  cache:
@@ -36,7 +37,7 @@ linux:build:
        - dist/
        - linux-2/*.log
        - linux-3/*.log
 -      - linux-4/*.log
 +      - linux-4/
    needs:
      - job: linux:install
        artifacts: true
@@ -45,8 +46,10 @@ linux:build:
      #- bin/create-target.sh xtarget x86_linux_clang
      #- bin/create-target.sh xcross x86_linux_clang
      #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp
 -    # Regular build using the cross-compiled result or snapshot
 -    - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp
 +    # Regular build using the cross-compiled result or snapshot.  The
 +    # analyzer job requires gcc, so make sure we build with gcc here
 +    # instead of clang.
 +    - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp
      # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp
      # Use -V to specify the version in case some tag makes git
      # describe return something that make-dist.sh doesn't like.
@@ -62,6 +65,8 @@ linux:cross-build:
        - linux-2/*.log
        - linux-3/*.log
        - linux-4/*.log
 +      # The lisp directory is needed for the static analyzer job.
 +      - linux-4/lisp
    needs:
      # Normally need the linux:install stage to get the compiler to
@@ -232,3 +237,24 @@ osx:benchmark:
      - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh
      - CMUCL=../../dist/bin/lisp ./run-cmucl.sh
      - ../../snapshot/bin/lisp -load report
++
 +# Optional job that runs the static analyzer.  It needs the files from
 +# the linux-4 directory built in the linux:build job.
 +linux:static-analyzer:
 +  stage: analyze
 +  when: manual
 +  tags:
 +    - linux
 +  artifacts:
 +    paths:
 +      - analyzer.log
 +  needs:
 +    - job: linux:build
 +      artifacts: true
 +  script:
 +    # Analysis can generate huge amounts of output.  For now just save
 +    # the results to the log file instead of also having it go to the
 +    # console.  If someday there's less or no output, we can consider
 +    # having the logs go to the console too.
 +    - make -C linux-4/lisp clean
 +    - make -C linux-4/lisp CFLAGS=-fanalyzer > analyzer.log 2>&1

@@ -3313,8 +3313,8 @@
    #+(and unicode (not unicode-bootstrap))
    '(let* ((ac (char-code a))
  	  (bc (char-code b)))
 -     (if (and (<= ac #x7f)
 -	      (<= bc #x7f))
 +     (if (and (<= ac +ascii-limit+)
 +	      (<= bc +ascii-limit+))
  	 ;; ASCII
  	 (let ((sum (logxor ac bc)))
  	   (or (zerop sum)

@@ -49,7 +49,9 @@
  ;;; No problems.
  ;#+nil
  (def-vm-support-routine make-return-pc-passing-location (standard)
 -  (declare (ignore standard))
 +  ;; Should be IGNORE, not IGNORABLE; We're just silencing a compiler
 +  ;; note.
 +  (declare (ignorable standard))
    (make-wired-tn (primitive-type-or-lose 'system-area-pointer *backend*)
  		 sap-stack-sc-number return-pc-save-offset))
  ;;;
@@ -77,7 +79,9 @@
  ;;; No problems
  ;#+nil
  (def-vm-support-routine make-old-fp-passing-location (standard)
 -  (declare (ignore standard))
 +  ;; Should be IGNORE, not IGNORABLE; We're just silencing a compiler
 +  ;; note.
 +  (declare (ignorable standard))
    (make-wired-tn *fixnum-primitive-type* control-stack-sc-number
  		 ocfp-save-offset))
  ;;;

@@ -128,6 +128,10 @@ make_var(char *name, boolean perm)
  	name = buffer;
+     }
      var->name = (char *) malloc(strlen(name) + 1);
 +    if (var->name == NULL) {
 +	perror("malloc");
 +	exit(1);
 +    }
      strcpy(var->name, name);
      var->clock = 0;
      var->permanent = perm;

Raymond Toy pushed to branch issue-306-lisp.c at cmucl / cmucl

Commits:

11 changed files:

Changes:

@@ -22,7 +22,7 @@
       :conservative-float-type
       :hash-new
       :random-mt19937
 -     :cmu :cmu20 :cmu20a		; Version features
 +     :cmu :cmu21 :cmu21e		; Version features
       :double-double			; double-double float support
+      )
     ;; Features to remove from current *features* here.  Normally don't

@@ -17,7 +17,7 @@
       :darwin				; Darwin OS (Mac OS X)
       :bsd				; We're a BSD-type OS
       :cmu				; Announce this is CMUCL
 -     :cmu20 :cmu20a			; (Mostly) current version identifier
 +     :cmu21 :cmu21e			; (Mostly) current version identifier
       :gencgc				; Generational GC is supported on ppc.
       :relative-package-names
       :modular-arith			; Modular arithmetic

@@ -23,7 +23,7 @@
       :hash-new
       :random-mt19937			; MT-19937 generator
       :cmu				; Announce this is CMUCL
 -     :cmu20 :cmu20b			; Current version identifier
 +     :cmu21 :cmu21e			; Current version identifier
       :modular-arith			; Modular arithmetic
       :double-double			; Double-double float support
       :executable