49 lines
2.8 KiB
Diff
49 lines
2.8 KiB
Diff
|
diff -up hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp.strncpy hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp
|
||
|
|
--- hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp.strncpy 2015-01-21 16:52:44.066497631 +0000
|
||
|
|
+++ hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp 2015-01-21 16:59:46.216434376 +0000
|
||
|
|
@@ -203,6 +203,7 @@ HPCupsFilter::HPCupsFilter() : m_pPrinte
|
||
|
|
adj_k_width = 0;
|
||
|
|
black_raster = NULL;
|
||
|
|
color_raster = NULL;
|
||
|
|
+ memset (&m_JA, 0, sizeof (m_JA));
|
||
|
|
}
|
||
|
|
|
||
|
|
HPCupsFilter::~HPCupsFilter()
|
||
|
|
@@ -384,9 +385,9 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
|
||
|
|
m_JA.media_attributes.physical_height = cups_header->PageSize[1];
|
||
|
|
m_JA.media_attributes.printable_width = ((cups_header->ImagingBoundingBox[2]-cups_header->ImagingBoundingBox[0]) * horz_res) / 72;
|
||
|
|
m_JA.media_attributes.printable_height = ((cups_header->ImagingBoundingBox[3]-cups_header->ImagingBoundingBox[1]) * vert_res) / 72;
|
||
|
|
- strncpy(m_JA.media_attributes.PageSizeName, &cups_header->cupsString[0][0], sizeof(m_JA.media_attributes.PageSizeName));
|
||
|
|
- strncpy(m_JA.media_attributes.MediaTypeName, cups_header->MediaType, sizeof(m_JA.media_attributes.MediaTypeName));
|
||
|
|
- strncpy(m_JA.quality_attributes.hbpl1_print_quality, cups_header->OutputType, sizeof(m_JA.quality_attributes.hbpl1_print_quality));
|
||
|
|
+ strncpy(m_JA.media_attributes.PageSizeName, &cups_header->cupsString[0][0], sizeof(m_JA.media_attributes.PageSizeName)-1);
|
||
|
|
+ strncpy(m_JA.media_attributes.MediaTypeName, cups_header->MediaType, sizeof(m_JA.media_attributes.MediaTypeName)-1);
|
||
|
|
+ strncpy(m_JA.quality_attributes.hbpl1_print_quality, cups_header->OutputType, sizeof(m_JA.quality_attributes.hbpl1_print_quality)-1);
|
||
|
|
m_JA.color_mode = cups_header->cupsRowStep;
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
diff -up hplip-3.14.10/prnt/hpijs/hpijs.cpp.strncpy hplip-3.14.10/prnt/hpijs/hpijs.cpp
|
||
|
|
--- hplip-3.14.10/prnt/hpijs/hpijs.cpp.strncpy 2015-01-21 17:00:03.225512410 +0000
|
||
|
|
+++ hplip-3.14.10/prnt/hpijs/hpijs.cpp 2015-01-21 17:04:59.308870785 +0000
|
||
|
|
@@ -605,7 +605,7 @@ int main (int argc, char *argv[], char *
|
||
|
|
}
|
||
|
|
|
||
|
|
if (argc > 2)
|
||
|
|
- strncpy(user_name, argv[2], sizeof(user_name));
|
||
|
|
+ strncpy(user_name, argv[2], sizeof(user_name) - 1);
|
||
|
|
|
||
|
|
#ifdef HAVE_LIBHPIP
|
||
|
|
char *pDev;
|
||
|
|
diff -up hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy hplip-3.14.10/prnt/hpijs/hpijsfax.cpp
|
||
|
|
--- hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy 2015-01-21 17:05:06.585904171 +0000
|
||
|
|
+++ hplip-3.14.10/prnt/hpijs/hpijsfax.cpp 2015-01-21 17:05:15.787946389 +0000
|
||
|
|
@@ -282,7 +282,7 @@ int hpijsFaxServer (int argc, char **arg
|
||
|
|
char user_name[32]={0,};
|
||
|
|
|
||
|
|
if (argc > 2)
|
||
|
|
- strncpy(user_name, argv[2], sizeof(user_name));
|
||
|
|
+ strncpy(user_name, argv[2], sizeof(user_name) - 1);
|
||
|
|
|
||
|
|
snprintf(hpFileName,sizeof(hpFileName),"%s/hp_%s_ijsfax_Log_XXXXXX",CUPS_TMP_DIR, user_name);
|
||
|
|
|