"destination phone number" NULL wasn't checked for --ring-send & --picture-send

[mdsms.git] / mdsms.c

diff --git a/mdsms.c b/mdsms.c
index 686e402..69ab8a4 100644 (file)
--- a/mdsms.c
+++ b/mdsms.c
@@ -662,7 +662,11 @@ static const struct nullcheck {
        enum modenum reqd;
        const char *name;
        } nullcheck[]={
-               {&phone,MODE_BIT(MODE_SEND)|MODE_BIT(MODE_SEND_MOBILDOCK)|MODE_BIT(MODE_LOGO_SEND),
+               {&phone,MODE_BIT(MODE_SEND)
+                      |MODE_BIT(MODE_SEND_MOBILDOCK)
+                      |MODE_BIT(MODE_LOGO_SEND)
+                      |MODE_BIT(MODE_RING_SEND)
+                      |MODE_BIT(MODE_PICTURE_SEND),
                        N_("destination phone number")},
                {&   logoname,MODE_BIT(   MODE_LOGO_SEND),N_(   "logo filename")},
                {&   ringname,MODE_BIT(   MODE_RING_SEND),N_(   "ring filename")},
@@ -1430,7 +1434,7 @@ unsigned char binn[140]={
 unsigned char header[]={
        0x30,   /* version string '0' */
        0x02,   /* item=OTA bitmap */
-#define PICTURE_BYTES (((PICTURE_WIDTH+7)/8)*PICTURE_HEIGHT)
+#define PICTURE_BYTES ((PICTURE_WIDTH*PICTURE_HEIGHT+7)/8)
 #define PICTURE_BYTES_INCL_HEADER (PICTURE_BYTES +4/*header*/)
        PICTURE_BYTES_INCL_HEADER>>8,PICTURE_BYTES_INCL_HEADER&0xFF,    /* picture size in bytes incl. header */
        0x00, /* animation pictures - 0=static picture */