CMake: USE_CXX oughtn't restrict NOTCURSES_HEADERS

* use calloc to gain mucho speed for huge dimensions

CMakeLists.txt

@@ -548,6 +548,23 @@ target_compile_options(notcurses++
   -fPIC
   )
 
+target_compile_options(notcurses++-static
+  PRIVATE
+  ${NCPP_COMPILE_OPTIONS}
+  -fPIE
+)
+
+target_compile_definitions(notcurses++
+  PUBLIC
+    ${NCPP_COMPILE_DEFINITIONS_PUBLIC}
+)
+
+target_compile_definitions(notcurses++-static
+  PUBLIC
+    ${NCPP_COMPILE_DEFINITIONS_PUBLIC}
+)
+endif()
+
 target_compile_options(notcurses-core
   PRIVATE
     -fPIC
@@ -568,22 +585,6 @@ target_compile_options(notcurses-static
     -fPIE
 )
 
-target_compile_options(notcurses++-static
-  PRIVATE
-  ${NCPP_COMPILE_OPTIONS}
-  -fPIE
-)
-
-target_compile_definitions(notcurses++
-  PUBLIC
-    ${NCPP_COMPILE_DEFINITIONS_PUBLIC}
-)
-
-target_compile_definitions(notcurses++-static
-  PUBLIC
-    ${NCPP_COMPILE_DEFINITIONS_PUBLIC}
-)
-
 file(GLOB NOTCURSES_HEADERS
   CONFIGURE_DEPENDS
   LIST_DIRECTORIES false
@@ -599,7 +600,6 @@ file(GLOB NCPP_INTERNAL_HEADERS
   CONFIGURE_DEPENDS
   LIST_DIRECTORIES false
   ${PROJECT_SOURCE_DIR}/include/ncpp/internal/*.hh)
-endif()
 
 export(PACKAGE notcurses)
 

src/lib/notcurses.c

@@ -532,6 +532,30 @@ make_ncpile(notcurses* nc, ncplane* n){
   return ret;
 }
 
+
+static inline size_t  ncplane_sizeof_cellarray( unsigned rows, unsigned cols)
+{
+  size_t fbsize;
+  size_t size;
+
+  // (nat) This protects against size_t overflow and also checks
+  // that dimensions are not zero en-passant. Why ?
+  // Assume: size_t is 16 bit, unsigned is 8 bit (UINT_MAX: 0xFF)
+  // nccell is sizeof( *p->fb): 0x10 (128 bit)
+  //
+  // 0xFF * 0xFF * 0x10 = 0xFE010, but overflows so: 0xE010
+  // 0x3F * 0x3F * 0x10 = 0xf810 is the biggest square possible
+
+  size = (size_t) cols * (size_t) rows;
+  if( size < (size_t) cols || size < (size_t) rows)
+    return 0;
+
+  fbsize = sizeof( struct nccell) * size;
+  if( fbsize <= size)
+    return 0;
+
+  return fbsize;
+}
 // create a new ncplane at the specified location (relative to the true screen,
 // having origin at 0,0), having the specified size, and put it at the top of
 // the planestack. its cursor starts at its origin; its style starts as null.
@@ -590,14 +614,14 @@ ncplane* ncplane_new_internal(notcurses* nc, ncplane* n,
     p->leny = nopts->rows;
     p->lenx = nopts->cols;
   }
-  size_t fbsize = sizeof(*p->fb) * (p->leny * p->lenx);
-  if((p->fb = malloc(fbsize)) == NULL){
+
+  size_t fbsize = ncplane_sizeof_cellarray( p->leny, p->lenx);
+  if( ! fbsize || (p->fb = calloc(1,fbsize)) == NULL){
     logerror("error allocating cellmatrix (r=%u, c=%u)",
              p->leny, p->lenx);
     free(p);
     return NULL;
   }
-  memset(p->fb, 0, fbsize);
   p->x = p->y = 0;
   p->logrow = 0;
   p->sprite = NULL;

src/media/ffmpeg.c

@@ -707,7 +707,7 @@ ffmpeg_printbanner(fbuf* f){
 
 static void
 ffmpeg_details_destroy(ncvisual_details* deets){
-  avcodec_close(deets->codecctx);
+  // avcodec_close() is deprecated; avcodec_free_context() suffices
   avcodec_free_context(&deets->subtcodecctx);
   avcodec_free_context(&deets->codecctx);
   av_frame_free(&deets->frame);