COMMON: fix map crash, fix pahole

Author: chrisws

src/common/var_map.c

@@ -90,7 +90,7 @@ int map_length(const var_p_t var_p) {
 
 var_p_t map_get(var_p_t base, const char *name) {
   var_p_t result;
-  if (base->type == V_MAP) {
+  if (base != NULL && base->type == V_MAP) {
     result = hashmap_get(base, name);
   } else {
     result = NULL;

src/ui/image.cpp

@@ -37,17 +37,17 @@ void reset_image_cache() {
 }
 
 ImageBuffer::ImageBuffer() :
-  _bid(0),
   _filename(nullptr),
   _image(nullptr),
+  _bid(0),
   _width(0),
   _height(0) {
 }
 
 ImageBuffer::ImageBuffer(ImageBuffer &o) :
-  _bid(o._bid),
   _filename(o._filename),
   _image(o._image),
+  _bid(o._bid),
   _width(o._width),
   _height(o._height) {
 }

src/ui/image.h

@@ -17,9 +17,9 @@ struct ImageBuffer {
   ImageBuffer(ImageBuffer &imageBuffer);
   virtual ~ImageBuffer();
 
-  unsigned _bid;
   char *_filename;
   unsigned char *_image;
+  unsigned _bid;
   int _width;
   int _height;
 };