x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff

   1 Fixes buffer overflows and --as-needed issues
   2
   3 https://bugs.gentoo.org/show_bug.cgi?id=338936
   4
   5 Patch written by Kevin Pyle <gentoo.8eaf7cd8e5128d8191fe@spamgourmet.com>
   6 --- a/Makefile.am
   7 +++ b/Makefile.am
   8 @@ -1,4 +1,4 @@
   9 -AM_CPPFLAGS =  @CPPFLAGS@ @INTERLACE@ \
  10 +AM_CPPFLAGS =   @INTERLACE@ \
  11                 -DGLOBAL_BB=\"$(datadir)/bbtools/bbacpi.bb\" \
  12                 -DGLOBAL_NOBB=\"$(datadir)/bbtools/bbacpi.nobb\" \
  13                 -DGLOBAL_DATA=\"$(datadir)/bbtools\"
  14 --- a/bbacpi.cc
  15 +++ b/bbacpi.cc
  16 @@ -167,7 +167,7 @@ bool CheckLoad::checkbatteryfile (char* name, char* device)
  17    if (ret = (fp = fopen(name, "r"))) {
  18      char buffer[100];
  19      char present[20];
  20 -    fgets(buffer,128,fp);
  21 +    fgets(buffer, sizeof(buffer),fp);
  22      sscanf(buffer,"present:                 %s", present);
  23      if (strncmp(present, "yes", 3) != 0) {
  24        fprintf(stderr, "Device %s not present.\n", device);
  25 @@ -195,7 +195,7 @@ void CheckLoad::ReadStaticInfo()
  26      {
  27        /* Read data in any order */
  28        found = 0;
  29 -      while (found < 11 && (fgets(buffer, 63, fp) != NULL)) {
  30 +      while (found < 11 && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
  31         /* Present */
  32         if (strncmp(buffer, "present:", 7) == 0
  33             || strncmp(buffer, "Present:", 7) == 0) {
  34 @@ -277,7 +277,7 @@ void CheckLoad::ReadStaticInfo()
  35        {
  36         /* Read data in any order */
  37         found = 0;
  38 -       while (found < 11  && (fgets(buffer, 63, fp) != NULL)) {
  39 +       while (found < 11  && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
  40           /* Present */
  41           if (strncmp(buffer, "present:", 7) == 0
  42               || strncmp(buffer, "Present:", 7) == 0) {
  43 @@ -361,7 +361,7 @@ void CheckLoad::ReadStaticInfo()
  44    if ((fp = fopen(names.temptrip, "r")))
  45      {
  46        found = 0;
  47 -      while (found < 2 && (fgets(buffer,128,fp) != NULL)) {
  48 +      while (found < 2 && (fgets(buffer, sizeof(buffer),fp) != NULL)) {
  49         /* Critical */
  50         if (strncmp(buffer, "critical", 8) == 0
  51             || strncmp(buffer, "Critical", 8) == 0) {
  52 @@ -425,7 +425,7 @@ void CheckLoad::Reconfigure()
  53         if  (file_status.st_mtime != last_mtime)
  54           {
  55             found = 0;
  56 -           while (found < 4 && (fgets(buffer, 63, fp) != NULL)) {
  57 +           while (found < 4 && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
  58               /* Charging state */
  59               if (strncmp(buffer, "charging state:", 15) == 0
  60                   || strncmp(buffer, "Charging State:", 15) == 0) {
  61 @@ -463,7 +463,7 @@ void CheckLoad::Reconfigure()
  62         if  (file_status.st_mtime != last_mtime)
  63           {
  64             found = 0;
  65 -           while (found < 4 && (fgets(buffer, 63, fp) != NULL)) {
  66 +           while (found < 4 && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
  67               /* Charging state */
  68               if (strncmp(buffer, "charging state:", 15) == 0
  69                   || strncmp(buffer, "Charging State:", 15) == 0) {
  70 @@ -497,7 +497,7 @@ void CheckLoad::Reconfigure()
  71    if ((fp = fopen(names.adapter, "r")))
  72      {
  73        found = 0;
  74 -      while (found < 1 && (fgets(buffer, 63,fp) != NULL)) {
  75 +      while (found < 1 && (fgets(buffer, sizeof(buffer),fp) != NULL)) {
  76         if (strncmp(buffer, "state:", 6) == 0
  77             || strncmp(buffer, "State:", 6) == 0) {
  78           sscanf(buffer+offset,"%s", adapter.state);
  79 @@ -511,7 +511,7 @@ void CheckLoad::Reconfigure()
  80    if ((fp = fopen(names.temperature, "r")))
  81      {
  82        found = 0;
  83 -      while (found < 1 && (fgets(buffer, 63,fp) != NULL)) {
  84 +      while (found < 1 && (fgets(buffer, sizeof(buffer),fp) != NULL)) {
  85         if (strncmp(buffer, "temperature:", 12) == 0
  86             || strncmp(buffer, "Temperature:", 12) == 0) {
  87           sscanf(buffer+offset,"%u", &temperature.celcius);
  88 --- a/configure.in
  89 +++ b/configure.in
  90 @@ -89,12 +89,12 @@ AC_PATH_XTRA
  91
  92  CFLAGS="$CFLAGS $X_CFLAGS"
  93  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
  94 -LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
  95 +LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
  96  dnl Checks for X libraries.
  97 -AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
  98 +AC_CHECK_LIB(X11, XOpenDisplay,,
  99               AC_MSG_ERROR(XOpenDisplay not found in -lX11))
 100
 101 -LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
 102 +LIBS="$LIBS $X_EXTRA_LIBS"
 103
 104  dnl Check for Imlib
 105  AC_MSG_CHECKING([for Imlib])