More misc. fixes

Author: TRDario

addons/acodec/voc.c

@@ -277,7 +277,7 @@ ALLEGRO_SAMPLE *_al_load_voc_f(ALLEGRO_FILE *file)
    /*
     * Let's allocate at least the first block's bytes;
     */
-   buffer_size = vocdata->samples * vocdata->sample_size;
+   buffer_size = (size_t)vocdata->samples * vocdata->sample_size;
    buffer = al_malloc(buffer_size);
    if (!buffer) {
       return NULL;
@@ -304,7 +304,7 @@ ALLEGRO_SAMPLE *_al_load_voc_f(ALLEGRO_FILE *file)
             bytestoread = 0;
             READNBYTES(vocdata->file, bytestoread, 2, NULL);
             READNBYTES(vocdata->file, x, 1, NULL);
-            bytestoread += x<<16;
+            bytestoread += (size_t)x << 16;
             /* increase subsequently storage */
             buffer_size += bytestoread;
             buffer = al_realloc(buffer, buffer_size);

addons/primitives/primitives.c

@@ -313,12 +313,12 @@ ALLEGRO_INDEX_BUFFER* al_create_index_buffer(int index_size,
  */
 void al_destroy_vertex_buffer(ALLEGRO_VERTEX_BUFFER* buffer)
 {
-   int flags = al_get_display_flags(al_get_current_display());
-   ASSERT(addon_initialized);
-
    if (buffer == 0)
       return;
 
+   int flags = al_get_display_flags(al_get_current_display());
+   ASSERT(addon_initialized);
+
    al_unlock_vertex_buffer(buffer);
 
    if (flags & ALLEGRO_OPENGL) {
@@ -335,12 +335,12 @@ void al_destroy_vertex_buffer(ALLEGRO_VERTEX_BUFFER* buffer)
  */
 void al_destroy_index_buffer(ALLEGRO_INDEX_BUFFER* buffer)
 {
-   int flags = al_get_display_flags(al_get_current_display());
-   ASSERT(addon_initialized);
-
    if (buffer == 0)
       return;
 
+   int flags = al_get_display_flags(al_get_current_display());
+   ASSERT(addon_initialized);
+
    al_unlock_index_buffer(buffer);
 
    if (flags & ALLEGRO_OPENGL) {