Merge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'

* commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a':
  elbg: check memory allocations and propagate errors

Conflicts:
	libavcodec/elbg.c
	libavcodec/elbg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/elbg.c
index 9bbb6d8,4357e45..851be8e
--- 1/libavcodec/elbg.c
--- 2/libavcodec/elbg.c
+++ b/libavcodec/elbg.c
@@@ -334,44 -323,51 +334,51 @@@ static void do_shiftings(elbg_data *elb
  
  #define BIG_PRIME 433494437LL
  
- void avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook,
-                   int numCB, int max_steps, int *closest_cb,
-                   AVLFG *rand_state)
 -int ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
++int avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook,
+                  int numCB, int max_steps, int *closest_cb,
+                  AVLFG *rand_state)
  {
-     int i, k;
+     int i, k, ret = 0;
  
      if (numpoints > 24*numCB) {
          /* ELBG is very costly for a big number of points. So if we have a lot
             of them, get a good initial codebook to save on iterations       */
 -        int *temp_points = av_malloc(dim*(numpoints/8)*sizeof(int));
 +        int *temp_points = av_malloc_array(dim, (numpoints/8)*sizeof(int));
+         if (!temp_points)
+             return AVERROR(ENOMEM);
          for (i=0; i<numpoints/8; i++) {
              k = (i*BIG_PRIME) % numpoints;
              memcpy(temp_points + i*dim, points + k*dim, dim*sizeof(int));
          }
  
-         avpriv_init_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state);
-         avpriv_do_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state);
- 
 -        ret = ff_init_elbg(temp_points, dim, numpoints / 8, codebook,
 -                           numCB, 2 * max_steps, closest_cb, rand_state);
++        ret = avpriv_init_elbg(temp_points, dim, numpoints / 8, codebook,
++                               numCB, 2 * max_steps, closest_cb, rand_state);
+         if (ret < 0) {
+             av_freep(&temp_points);
+             return ret;
+         }
 -        ret = ff_do_elbg(temp_points, dim, numpoints / 8, codebook,
 -                         numCB, 2 * max_steps, closest_cb, rand_state);
++        ret = avpriv_do_elbg(temp_points, dim, numpoints / 8, codebook,
++                             numCB, 2 * max_steps, closest_cb, rand_state);
          av_free(temp_points);
  
      } else  // If not, initialize the codebook with random positions
          for (i=0; i < numCB; i++)
              memcpy(codebook + i*dim, points + ((i*BIG_PRIME)%numpoints)*dim,
                     dim*sizeof(int));
- 
+     return ret;
  }
  
- void avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
 -int ff_do_elbg(int *points, int dim, int numpoints, int *codebook,
++int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
                  int numCB, int max_steps, int *closest_cb,
                  AVLFG *rand_state)
  {
      int dist;
      elbg_data elbg_d;
      elbg_data *elbg = &elbg_d;
-     int i, j, k, last_error, steps=0;
+     int i, j, k, last_error, steps = 0, ret = 0;
 -    int *dist_cb = av_malloc(numpoints*sizeof(int));
 -    int *size_part = av_malloc(numCB*sizeof(int));
 -    cell *list_buffer = av_malloc(numpoints*sizeof(cell));
 +    int *dist_cb = av_malloc_array(numpoints, sizeof(int));
 +    int *size_part = av_malloc_array(numCB, sizeof(int));
 +    cell *list_buffer = av_malloc_array(numpoints, sizeof(cell));
      cell *free_cells;
      int best_dist, best_idx = 0;
  
@@@ -379,13 -375,19 +386,19 @@@
      elbg->dim = dim;
      elbg->numCB = numCB;
      elbg->codebook = codebook;
 -    elbg->cells = av_malloc(numCB*sizeof(cell *));
 -    elbg->utility = av_malloc(numCB*sizeof(int));
 +    elbg->cells = av_malloc_array(numCB, sizeof(cell *));
 +    elbg->utility = av_malloc_array(numCB, sizeof(int));
      elbg->nearest_cb = closest_cb;
      elbg->points = points;
 -    elbg->utility_inc = av_malloc(numCB*sizeof(int));
 -    elbg->scratchbuf = av_malloc(5*dim*sizeof(int));
 +    elbg->utility_inc = av_malloc_array(numCB, sizeof(*elbg->utility_inc));
 +    elbg->scratchbuf = av_malloc_array(5*dim, sizeof(int));
  
+     if (!dist_cb || !size_part || !list_buffer || !elbg->cells ||
+         !elbg->utility || !elbg->utility_inc || !elbg->scratchbuf) {
+         ret = AVERROR(ENOMEM);
+         goto out;
+     }
+ 
      elbg->rand_state = rand_state;
  
      do {

diff --cc libavcodec/elbg.h
index 22fb53f,3b1587a..f48aa3b
--- 1/libavcodec/elbg.h
--- 2/libavcodec/elbg.h
+++ b/libavcodec/elbg.h
@@@ -36,20 -36,22 +36,22 @@@
   * @param num_steps The maximum number of steps. One step is already a good compromise between time and quality.
   * @param closest_cb Return the closest codebook to each point. Must be allocated.
   * @param rand_state A random number generator state. Should be already initialized by av_lfg_init().
+  * @return < 0 in case of error, 0 otherwise
   */
- void avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
-                 int numCB, int num_steps, int *closest_cb,
-                 AVLFG *rand_state);
 -int ff_do_elbg(int *points, int dim, int numpoints, int *codebook,
++int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
+                int numCB, int num_steps, int *closest_cb,
+                AVLFG *rand_state);
  
  /**
   * Initialize the **codebook vector for the elbg algorithm. If you have already
   * a codebook and you want to refine it, you shouldn't call this function.
   * If numpoints < 8*numCB this function fills **codebook with random numbers.
 - * If not, it calls ff_do_elbg for a (smaller) random sample of the points in
 - * **points. Get the same parameters as ff_do_elbg.
 + * If not, it calls avpriv_do_elbg for a (smaller) random sample of the points in
 + * **points. Get the same parameters as avpriv_do_elbg.
+  * @return < 0 in case of error, 0 otherwise
   */
- void avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook,
-                   int numCB, int num_steps, int *closest_cb,
-                   AVLFG *rand_state);
 -int ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
++int avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook,
+                  int numCB, int num_steps, int *closest_cb,
+                  AVLFG *rand_state);
  
  #endif /* AVCODEC_ELBG_H */