Fix memory leak when using Pin.getInfo on a pin with ADCs (and non-re…

…porting of analogs)
espruino · Jul 3, 2024 · eacd006 · eacd006
1 parent 28b175a
commit eacd006
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@
             Bangle.js2: After Bangle.showTestScreen, put Bangle.js into a hard off state (not soft off)
             Fix for unexpected power draw on newest batch of Bangle.js devices
             Puck.js: skip CRT startup code to save ~300b
+            Fix memory leak when using Pin.getInfo on a pin with ADCs (and non-reporting of analogs)
 
      2v23 : Fix XON/OFF thresholds to be based off the correct buffer size
             Bangle.js2: Added BANGLE2_IFLASH target for firmware using internal flash for js files (currently only partially working)

diff --git a/src/jswrap_pin.c b/src/jswrap_pin.c
@@ -326,7 +326,9 @@ JsVar *jswrap_pin_getInfo(
             jsvArrayPushAndUnLock(arr, jsvNewFromInteger(1+i));
         jsvObjectSetChildAndUnLock(an, "ADCs", arr);
       }
-      jsvObjectSetChildAndUnLock(obj, "channel", jsvNewFromInteger(inf->analog & JSH_MASK_ANALOG_CH));
+      jsvObjectSetChildAndUnLock(an, "channel", jsvNewFromInteger(inf->analog & JSH_MASK_ANALOG_CH));
+      jsvObjectSetChildAndUnLock(obj, "channel", jsvNewFromInteger(inf->analog & JSH_MASK_ANALOG_CH)); // for backwards compatibility with 2v22 and earlier
+      jsvObjectSetChildAndUnLock(obj, "analog", an);
     }
   }
   JsVar *funcs = jsvNewObject();